diff --git a/project.yml b/project.yml
index 2682e52..7354a95 100644
--- a/project.yml
+++ b/project.yml
@@ -91,17 +91,6 @@
   :system:
     - m  # Example: add 'm' to use the math library
   :test:
-<<<<<<< HEAD
-    - stdio
-    - string
-    - stdlib
-    - m  # Example: add 'm' to use the math library in tests
-  :release:
-    - stdio
-    - string
-    - stdlib
-    - m  # Example: add 'm' to use the math library in release builds
-=======
     #- stdio
     #- string
     #- stdlib
@@ -111,8 +100,6 @@
     #- string
     #- stdlib
     #- m  # Example: add 'm' to use the math library in release builds
->>>>>>> develop
-
 :plugins:
   :load_paths:
     - "#{Ceedling.load_path}"