diff --git a/src/DefaultContentManager.php b/src/DefaultContentManager.php
index bb34cba..64ca383 100644
--- a/src/DefaultContentManager.php
+++ b/src/DefaultContentManager.php
@@ -61,7 +61,6 @@ class DefaultContentManager implements DefaultContentManagerInterface {
   protected $entityTypeManager;
 
   /**
-<<<<<<< HEAD
    * The entity repository.
    *
    * @var \Drupal\Core\Entity\EntityRepositoryInterface
@@ -69,8 +68,6 @@ class DefaultContentManager implements DefaultContentManagerInterface {
   protected $entityRepository;
 
   /**
-=======
->>>>>>> origin/8.x-1.x
    * The module handler.
    *
    * @var \Drupal\Core\Extension\ModuleHandlerInterface