diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 2ae04ed02e..b5ed5ecaa1 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -63,11 +63,7 @@ add_openmw_dir (mwlua
     context menuscripts globalscripts localscripts playerscripts luabindings objectbindings cellbindings coremwscriptbindings
     mwscriptbindings camerabindings vfsbindings uibindings soundbindings inputbindings nearbybindings dialoguebindings
     postprocessingbindings stats recordstore debugbindings corebindings worldbindings worker landbindings magicbindings factionbindings
-<<<<<<< HEAD
-    classbindings itemdata inputprocessor animationbindings birthsignbindings racebindings markupbindings regionbindings
-=======
-    classbindings itemdata inputprocessor animationbindings birthsignbindings racebindings markupbindings weatherbindings
->>>>>>> origin/master
+    classbindings itemdata inputprocessor animationbindings birthsignbindings racebindings markupbindings weatherbindings regionbindings
     types/types types/door types/item types/actor types/container types/lockable types/weapon types/npc
     types/creature types/player types/activator types/book types/lockpick types/probe types/apparatus
     types/potion types/ingredient types/misc types/repair types/armor types/light types/static