diff --git a/files/routes/awards.py b/files/routes/awards.py
index e8095ccbe0..5dc02abb7e 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -307,7 +307,6 @@ def shop(v):
 @validate_formkey
 def buy(v, award):
 	AWARDS = {
-<<<<<<< HEAD
 		"snow": {
 			"kind": "snow",
 			"title": "Snow",