diff --git a/SRC/app/Http/Controllers/GameController.php b/SRC/app/Http/Controllers/GameController.php
index 0f98b15..4332742 100755
--- a/SRC/app/Http/Controllers/GameController.php
+++ b/SRC/app/Http/Controllers/GameController.php
@@ -97,12 +97,8 @@ class GameController extends Controller {
             default:
                 break;
         }
-<<<<<<< HEAD
-        Response::make('records')->withCookie(Cookie::forever('trophee', $values));
-=======
         
-        $response->withCookie(Cookie::forever('trophee', $values));
->>>>>>> 550ca526b9ba7c2d56b4b5096b3bce0d7e567414
+        Response::make('records')->withCookie(Cookie::forever('trophee', $values));
     }
 
 }