diff --git a/_src/gaming/checklists.md b/_src/gaming/checklists.md
index 3ffb8a5..dcf438a 100644
--- a/_src/gaming/checklists.md
+++ b/_src/gaming/checklists.md
@@ -12,9 +12,5 @@ This page will be periodically updated once a new list has been created and publ
 
 # List
 ## Added on 2024-04-13
-<<<<<<< HEAD
 - [The Legend of Zelda: Breath of the Wild](https://public-files.arian.li/Gaming-Checklists/BotW-Checklists.ods)
-=======
-- [The Legend of Zelda: Breath of the Wild](https://public-files.arian.li/Gaming-Checklists/BotW-Checklists.ods) 
->>>>>>> 7bc9f932fc95e932dcfe51dbdafb5d93ebe8434a
 - [Assassin's Creed 2](https://public-files.arian.li/Gaming-Checklists/AC2-Checklists.ods)