diff --git a/src/lisp/main.c b/src/lisp/main.c
index b2c7590..c39faac 100644
--- a/src/lisp/main.c
+++ b/src/lisp/main.c
@@ -17,9 +17,15 @@
 		return 1;
 	}
 
+<<<<<<< HEAD
 	struct environment env = compile_all(is);
 	value_t (*lisp_main)() = find_function(&env, "main")->def0;
 	lisp_main();
 
 	del_fistream(is);
+=======
+	struct environment env = compile_all (is);
+	value_t (*lisp_main) () = find_function(&env, "main")->def0;
+	lisp_main ();
+>>>>>>> 6afa62d (Remove free)
 }