diff --git a/src/main.lisp b/src/main.lisp
index dd70ec3..012da67 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -9,10 +9,7 @@
 (asdf:load-system 'log4cl)
 (asdf:load-system 'fiveam)
 (asdf:load-system 'clack)
-<<<<<<< HEAD
 (asdf:load-system 'ningle)
-=======
->>>>>>> 4ab5c05 (idk)
 
 (defpackage tfcserver
   (:use :cl :com.inuoe.jzon :spinneret :serapeum))