diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 522e34a10b..47d35108a1 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-//include unit test files in this module in this ifdef
-
-#ifdef UNIT_TESTS
-#include "unit_test.dm"
-#endif
-=======
 //include unit test files in this module in this ifdef
 
 #ifdef UNIT_TESTS
@@ -12,4 +5,3 @@
 #include "reagent_recipe_collisions.dm"
 #include "reagent_id_typos.dm"
 #endif
->>>>>>> ad7fc74... Added chemical reaction unit tests (#35478)