diff --git a/tools/configurator/export_presets.cfg b/tools/configurator/export_presets.cfg
index b29189cf..f4fbb7ea 100644
--- a/tools/configurator/export_presets.cfg
+++ b/tools/configurator/export_presets.cfg
@@ -19,11 +19,7 @@ encrypt_directory=false
 custom_template/debug=""
 custom_template/release=""
 debug/export_console_wrapper=1
-<<<<<<< HEAD
-binary_format/embed_pck=true
-=======
 binary_format/embed_pck=false
->>>>>>> 62724325fd58f43d1c9a4b0dbcc0c891e20ad54d
 texture_format/bptc=true
 texture_format/s3tc=true
 texture_format/etc=false
diff --git a/tools/configurator/project.godot b/tools/configurator/project.godot
index 2b37895c..5182f8ac 100644
--- a/tools/configurator/project.godot
+++ b/tools/configurator/project.godot
@@ -11,11 +11,7 @@ config_version=5
 [application]
 
 config/name="RetroDECK Configurator"
-<<<<<<< HEAD
 config/version="v0.051"
-=======
-config/version="v0.05"
->>>>>>> 62724325fd58f43d1c9a4b0dbcc0c891e20ad54d
 run/main_scene="res://main.tscn"
 config/features=PackedStringArray("4.2", "GL Compatibility")
 boot_splash/bg_color=Color(0.141176, 0.141176, 0.141176, 0)