diff --git a/create_9.sql b/create_9.sql
index 6d2536e..cb46789 100644
--- a/create_9.sql
+++ b/create_9.sql
@@ -3,11 +3,7 @@ CREATE TABLE players (
     player_name VARCHAR2(15),
     contact_email VARCHAR2(25),
     contact_number CHAR(13)
-<<<<<<< HEAD
 );
-=======
-);
->>>>>>> 3d5803ccf80e7a46ce8acc07ecaa3a5205add4a6
 
 CREATE TABLE teams (
     team_id NUMBER(4),
@@ -89,4 +85,4 @@ CREATE TABLE game_participants (
     game_participant_id NUMBER(16),
     game_id NUMBER(8),
     tournament_participant_id NUMBER(8)
-);
\ No newline at end of file
+);