diff --git a/install.sql b/install.sql
index 21d199d..b1e125f 100644
--- a/install.sql
+++ b/install.sql
@@ -1,10 +1,4 @@
 CREATE TABLE `arena_history` (
-<<<<<<< HEAD
-=======
-
-CREATE TABLE IF NOT EXISTS `arena_history` (
-
->>>>>>> f4f3a1f5e4b489cb7ef2bf70fc80467382f82585
   `game` varchar(8) NOT NULL,
   `player1_id` int(11) NOT NULL,
   `player2_id` int(11) NOT NULL,