diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
index 1acf4c480..121cbbf9f 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -9,6 +9,18 @@
  * @see https://www.champs-libres.coop/
  */
 
+namespace Chill\ActivityBundle\DataFixtures\ORM;
+
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\RoleScope;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+use function in_array;
+
 declare(strict_types=1);
 
 class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterface
@@ -35,7 +47,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
                         break;
                     case 'administrative':
                     case 'direction':
-                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
index a75aa0902..7f1b9a6b5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
@@ -26,7 +26,6 @@ use Chill\MainBundle\Test\PrepareClientTrait;
  */
 final class PersonControllerCreateTest extends WebTestCase
 {
-<<<<<<< HEAD
     use PrepareClientTrait;
 
     const FIRSTNAME_INPUT = 'chill_personbundle_person_creation[firstName]';
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
index ae1372beb..aff8432d1 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
@@ -13,8 +13,6 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\ThirdPartyType;
 
-use self;
-
 /**
  * Manages types of third parties.
  */