diff --git a/pong/game/utils.py b/pong/game/utils.py
index 0febfff..07dc265 100644
--- a/pong/game/utils.py
+++ b/pong/game/utils.py
@@ -3,7 +3,6 @@ from django.core.exceptions import ValidationError
 from django.shortcuts import get_object_or_404
 from django.db.models import Max, Sum, F
 from datetime import timedelta
-<<<<<<< HEAD
 from channels.db import database_sync_to_async
 
 async def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament):
@@ -27,26 +26,6 @@ async def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_
     await uptdate_player_statistics(p2)
 
 @database_sync_to_async
-=======
-
-def endfortheouche(p1, p2, s_p1, s_p2, winner, bt_p1, bt_p2, dur, is_tournoi, name_tournament) :
-    #If he doesn't exist, create player p1
-    if not Player.objects.filter(name=p1).exist():
-        create_player(p1)
-
-    #If he doesn't exist, create player p2
-    if not Player.objects.filter(name=p2).exist():
-        create_player(p2)
-    
-    #create Match
-    create_match(p1, p2, s_p1, s_p2, bt_p1, bt_p2, dur, is_tournoi, name_tournamenttournoi)
-
-    #Update data p1 et p2
-    uptdate_player_statistics(p1)
-    uptdate_player_statistics(p2)
-
-
->>>>>>> f31331d344927dfd9bca940943bdba9a4d79a2b4
 def create_player(
     name, 
     total_match=0, 
@@ -81,19 +60,13 @@ def create_player(
     player.save()
     return player
 
-<<<<<<< HEAD
 @database_sync_to_async
-=======
->>>>>>> f31331d344927dfd9bca940943bdba9a4d79a2b4
 def create_tournoi(name, nbr_player, date, winner):
     tournoi = Tournoi(name=name, nbr_player=nbr_player, date=date, winner=winner)
     tournoi.save()
     return tournoi
 
-<<<<<<< HEAD
 @database_sync_to_async
-=======
->>>>>>> f31331d344927dfd9bca940943bdba9a4d79a2b4
 def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi):
     match = Match(
         player1=player1,