diff --git a/README.md b/README.md
index e61e91007a2d..92c94ca2b01b 100644
--- a/README.md
+++ b/README.md
@@ -58,11 +58,8 @@ Currently, the following games are supported:
 * Heretic
 * Landstalker: The Treasures of King Nole
 * Final Fantasy Mystic Quest
-<<<<<<< Updated upstream
 * TUNIC
-=======
 * Mario & Luigi: Superstar Saga
->>>>>>> Stashed changes
 
 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
 Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled