diff --git a/project.clj b/project.clj
index a9696ab..d153482 100644
--- a/project.clj
+++ b/project.clj
@@ -4,12 +4,6 @@
   :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
             :url "https://www.eclipse.org/legal/epl-2.0/"}
   :dependencies [[org.clojure/clojure "1.11.1"]
-<<<<<<< HEAD
-                 [babashka/fs "0.1.6"]
-                 [quil "4.0.0-SNAPSHOT"]]
-||||||| 1c2ab51
-                 [babashka/fs "0.1.6"]]
-=======
                  [babashka/fs "0.1.6"]
                  [quil "4.0.0-SNAPSHOT-1"]]
 >>>>>>> 55d76f6854bf67119873d98e2c9c18d8390ab90a