diff --git a/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
index e82d7ed189..571c7e7abb 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/FilesLoader.php
@@ -17,13 +17,8 @@ namespace Symfony\Component\Validator\Mapping\Loader;
  * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
-<<<<<<< HEAD
- * @see YamlFileLoader
- * @see XmlFileLoader
-=======
  * @see YamlFilesLoader
  * @see XmlFilesLoader
->>>>>>> pull/12201
  */
 abstract class FilesLoader extends LoaderChain
 {