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