diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
index 657891a44..8f4a34c0e 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
@@ -66,7 +66,4 @@ require_once __DIR__.'/../AssociationOverrides.php';
 require_once __DIR__.'/../AttributeOverride.php';
 require_once __DIR__.'/../AttributeOverrides.php';
 require_once __DIR__.'/../EntityListeners.php';
-<<<<<<< HEAD
-=======
 require_once __DIR__.'/../Cache.php';
->>>>>>> 69cad4079dcfbee273e7451ee6361a82c2432afb