diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index aedea4396..922081d05 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -2,9 +2,12 @@ parameters:
 #    cl_chill_person.example.class: Chill\PersonBundle\Example
 
 services:
+<<<<<<< HEAD
     _defaults:
         autowire: true
         autoconfigure: true
+=======
+>>>>>>> Removing spaces at the end of line
 
     Chill\PersonBundle\Service\:
         resource: '../Service/'