diff --git a/AutFN.jl b/AutFN.jl
index f69a3ee..08153ac 100644
--- a/AutFN.jl
+++ b/AutFN.jl
@@ -80,7 +80,21 @@ end
 
 function main()
 
+<<<<<<< Updated upstream
     parsed_args = parse_commandline()
+=======
+    tol = parsed_args["tol"]
+    iterations = parsed_args["iterations"]
+
+    solver = SCSSolver(eps=tol, max_iters=iterations, verbose=true, linearsolver=SCS.Indirect)
+
+    N = parsed_args["N"]
+    upper_bound = parsed_args["upper-bound"]
+
+    name = "SOutF$N"
+    name = name*"-$(string(upper_bound))"
+    S() = generating_set_of_SOutF(N)
+>>>>>>> Stashed changes
 
     if parsed_args["cpus"] ≠ nothing
         if parsed_args["cpus"] > cpuinfo_physicalcores()