diff --git a/bot.go b/bot.go
index 29c0233..664bf2d 100644
--- a/bot.go
+++ b/bot.go
@@ -15,18 +15,6 @@ import (
 var (
 	canteen *openmensa.Canteen
 
-<<<<<<< HEAD
-	emojis = map[string][]string{
-		":pizza:":        {"pizza"},
-		":hotdog:":       {"wurst"},
-		":fries:":        {"pommes"},
-		":hamburger:":    {"burger"},
-		":fish:":         {"lachs", "filet", "fisch", "kabeljau"},
-		":apple:":        {"apfel", "äpfel"},
-		":poultry_leg:":  {"hänchen"},
-		":meat_on_bone:": {"schnitzel"},
-		":spaghetti:":    {"nudel", "spaghetti", "pasta"},
-=======
 	emojis = map[string][]string {
 		":pizza:": {"pizza"},
 		":hotdog:": {"wurst", "würstchen", "hotdog"},
@@ -39,7 +27,6 @@ var (
 		":spaghetti:": {"nudel", "spaghetti", "pasta"},
 		":bread:": {"brot", "brötchen"},
 		":rice:": {"reis"}
->>>>>>> ccc765c03c0d2197ea832ae11f6f8795cdf7ac6b
 	}
 )