diff --git a/config/splash.properties b/config/splash.properties
index 7638a60b..65efb347 100644
--- a/config/splash.properties
+++ b/config/splash.properties
@@ -5,9 +5,7 @@ barBackground=0xFFFFFF
 memoryGood=0x78CB34
 showMemory=true
 enabled=true
->>>>>>>=Stashed changes
 forgeTexture=modpack\:textures/gui/dog.gif
-<<<<<<<=Updated upstream
 font=0x0
 memoryLow=0xE42F2F
 memoryWarn=0xE6E84A