diff --git a/bot.go b/bot.go
index 7d7a9da..29c0233 100644
--- a/bot.go
+++ b/bot.go
@@ -15,6 +15,7 @@ import (
 var (
 	canteen *openmensa.Canteen
 
+<<<<<<< HEAD
 	emojis = map[string][]string{
 		":pizza:":        {"pizza"},
 		":hotdog:":       {"wurst"},
@@ -25,6 +26,20 @@ var (
 		":poultry_leg:":  {"hänchen"},
 		":meat_on_bone:": {"schnitzel"},
 		":spaghetti:":    {"nudel", "spaghetti", "pasta"},
+=======
+	emojis = map[string][]string {
+		":pizza:": {"pizza"},
+		":hotdog:": {"wurst", "würstchen", "hotdog"},
+		":fries:": {"pommes"},
+		":hamburger:": {"burger"},
+		":fish:": {"lachs", "filet", "fisch", "kabeljau", "hering", "makrele", "sardine", "schellfisch", "seezunge"},
+		":apple:": {"apfel", "äpfel"},
+		":poultry_leg:": {"hähnchen"},
+		":meat_on_bone:": {"schnitzel", "steak", "schwein", "huhn", "geflügel"},
+		":spaghetti:": {"nudel", "spaghetti", "pasta"},
+		":bread:": {"brot", "brötchen"},
+		":rice:": {"reis"}
+>>>>>>> ccc765c03c0d2197ea832ae11f6f8795cdf7ac6b
 	}
 )