diff --git a/src/language.c b/src/language.c
index 4e874f42e0..a276a30b6d 100644
--- a/src/language.c
+++ b/src/language.c
@@ -42,12 +42,8 @@ const char *language_filenames[LANGUAGE_COUNT] = {
 	"dutch",			// LANGUAGE_DUTCH
 	"french",			// LANGUAGE_FRENCH
 	"hungarian",		// LANGUAGE_HUNGARIAN
-<<<<<<< HEAD
 	"polish",			// LANGUAGE_POLISH
 	"spanish_sp"		// LANGUAGE_SPANISH
-=======
-	"polish"			// LANGUAGE_POLISH
->>>>>>> new-ride-window
 };
 
 int gCurrentLanguage = LANGUAGE_UNDEFINED;