diff --git a/projects.json b/projects.json
index bf1c0c1..2e40d37 100644
--- a/projects.json
+++ b/projects.json
@@ -21,8 +21,4 @@
       "priority": 4
     }
   ]
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> d87156cc708ff871f6e05ec29401201e19601016
+}
\ No newline at end of file