diff --git a/config/packages/security.yaml b/config/packages/security.yaml
index 8a6be3a..5ad39df 100644
--- a/config/packages/security.yaml
+++ b/config/packages/security.yaml
@@ -1,5 +1,4 @@
 security:
-<<<<<<< HEAD
   # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
   password_hashers:
     Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
@@ -26,37 +25,6 @@ security:
 
       # activate different ways to authenticate
       # https://symfony.com/doc/current/security.html#the-firewall
-=======
-    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
-    password_hashers:
-        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
-    # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
-    providers:
-        # used to reload user from session & other features (e.g. switch_user)
-        app_user_provider:
-            entity:
-                class: App\Entity\Utilisateur
-                property: email
-    firewalls:
-        dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
-            security: false
-
-        main:
-            lazy: true
-            provider: app_user_provider
-
-            form_login:
-                login_path: app_login
-                check_path: app_login
-                enable_csrf: true
-                csrf_token_id: authenticate
-
-            logout:
-                path: app_logout
-                target: app_login
-
->>>>>>> b29391d6550c182d7b75efab8795a238c1936a27
 
       # https://symfony.com/doc/current/security/impersonating_user.html
       # switch_user: true