diff --git a/RetroDECK-cooker.flatpak.sha b/RetroDECK-cooker.flatpak.sha
new file mode 100644
index 00000000..e69de29b
diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg
index 3aca9069..9b210b97 100644
--- a/automation_tools/automation_task_list.cfg
+++ b/automation_tools/automation_task_list.cfg
@@ -22,4 +22,4 @@ hash^RETRODECKPRIMEHACKLATEST^https://github.com/RetroDECK/io.github.shiiion.pri
 hash^RETRODECKMELONDSLATEST^https://github.com/RetroDECK/net.kuribo64.melonDS/releases/latest/download/RetroDECK-melonds-Artifact.tar.gz
 hash^RETRODECKSOLARUSLATEST^https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest/download/RetroDECK-solarus-Artifact.tar.gz
 hash^RETRODECKGZDOOMLATEST^https://github.com/RetroDECK/org.zdoom.GZDoom/releases/latest/download/RetroDECK-gzdoom-Artifact.tar.gz
-hash^RETRODECKMAMELATEST^https://github.com/RetroDECK/MAME/releases/latest/download/RetroDECK-MAME-Artifact.tar.gz
\ No newline at end of file
+hash^RETRODECKMAMELATEST^https://github.com/RetroDECK/MAME/releases/latest/download/RetroDECK-MAME-Artifact.tar.gz
diff --git a/tools/configurator/data_list.json b/tools/configurator/data_list.json
index 8a6f1fe8..9f8a400d 100644
--- a/tools/configurator/data_list.json
+++ b/tools/configurator/data_list.json
@@ -405,8 +405,4 @@
 			]
 		}
 	}
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> 62724325fd58f43d1c9a4b0dbcc0c891e20ad54d