diff --git a/GameServer/alert-config.xml b/GameServer/alert-config.xml
index 5202c42..846732b 100644
--- a/GameServer/alert-config.xml
+++ b/GameServer/alert-config.xml
@@ -22,9 +22,4 @@
 			<priority>1</priority>
 		</email>
 	</user>
-<<<<<<< HEAD
 </alert>
-
-=======
-</alert>
->>>>>>> upstream/master