diff --git a/demos/2d/motion/engine.cfg b/demos/2d/motion/engine.cfg
index 29c4d0da203..261111904ce 100644
--- a/demos/2d/motion/engine.cfg
+++ b/demos/2d/motion/engine.cfg
@@ -3,12 +3,9 @@
 name="Motion Test"
 main_scene="res://motion.scn"
 
-<<<<<<< HEAD
-=======
 [display]
 
 width=800
 height=600
 stretch_mode="2d"
 stretch_aspect="keep"
->>>>>>> ab99671bb835a5fe24a092ec34afe1ad862ac254