diff --git a/vorestation.dme b/vorestation.dme
index 95f0e2765aa..7613179fa40 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2968,7 +2968,6 @@
 #include "code\modules\research\designs\subspace_parts.dm"
 #include "code\modules\research\designs\tech_disks.dm"
 #include "code\modules\research\designs\weapons.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\resleeving\circuitboards.dm"
 #include "code\modules\resleeving\computers.dm"
 #include "code\modules\resleeving\designer.dm"
@@ -2986,12 +2985,10 @@
 #include "code\modules\rogueminer_vr\wrappers.dm"
 #include "code\modules\rogueminer_vr\zone_console.dm"
 #include "code\modules\rogueminer_vr\zonemaster.dm"
-=======
 #include "code\modules\research\designs\xenoarch_toys.dm"
 #include "code\modules\research\designs\xenobio_toys.dm"
 #include "code\modules\research\designs\circuits\ai_modules.dm"
 #include "code\modules\research\designs\circuits\circuits.dm"
->>>>>>> 8ccac5f... Merge pull request #6459 from Heroman3003/re-sort-ch:polaris.dme
 #include "code\modules\scripting\Errors.dm"
 #include "code\modules\scripting\IDE.dm"
 #include "code\modules\scripting\Options.dm"