Fixed some merge conflicts

Author: javiereguiluz

.php_cs

@@ -6,9 +6,6 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('var')
     ->exclude('vendor')
     ->notPath('web/config.php')
-    // Doctrine fixtures are excluded to avoid these PHP-CS-Fixer errors:
-    // "Files were not fixed due to errors reported during linting before fixing"
-    ->notPath('DataFixtures')
 ;
 
 return PhpCsFixer\Config::create()

src/AppBundle/DataFixtures/ORM/PostFixtures.php

@@ -77,7 +77,6 @@ public function load(ObjectManager $manager)
         $manager->flush();
     }
 
-<<<<<<< HEAD:src/AppBundle/DataFixtures/ORM/PostFixtures.php
     /**
      * Instead of defining the exact order in which the fixtures files must be loaded,
      * this method defines which other fixtures this file depends on. Then, Doctrine
@@ -107,8 +106,6 @@ private function addRandomTags(Post $post)
         }
     }
 
-=======
->>>>>>> pull/431:src/AppBundle/DataFixtures/ORM/LoadFixtures.php
     private function getPostContent()
     {
         return <<<'MARKDOWN'