diff --git a/src/Controller/AuthenticationController.php b/src/Controller/AuthenticationController.php
index b19aed1..d8e6b43 100644
--- a/src/Controller/AuthenticationController.php
+++ b/src/Controller/AuthenticationController.php
@@ -18,11 +18,7 @@ class AuthenticationController extends AbstractController
         // last username entered by the user
         $lastUsername = $authenticationUtils->getLastUsername();
 
-<<<<<<< HEAD
-        return $this->render('calendrier/index.html.twig', [
-=======
         return $this->render('login/index.html.twig', [
->>>>>>> 05b64fc2b1e17491a87ea32353e6987b0e97bf50
             'last_username' => $lastUsername,
             'error' => $error,
         ]);