diff --git a/install.sql b/install.sql
index cba2d79..2ab8879 100644
--- a/install.sql
+++ b/install.sql
@@ -1,7 +1,7 @@
 CREATE TABLE `arena_history` (
-=======
+
 CREATE TABLE IF NOT EXISTS `arena_history` (
->>>>>>> origin/master
+
   `game` varchar(8) NOT NULL,
   `player1_id` int(11) NOT NULL,
   `player2_id` int(11) NOT NULL,