diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
index 2e76c86..b2401a7 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -8,12 +8,8 @@
 namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-<<<<<<< HEAD
 use Drupal\Core\Entity\Plugin\DataType\EntityTypedDataWrapper;
-||||||| merged common ancestors
-=======
 use Drupal\Core\Field\FieldDefinition;
->>>>>>> 8.x
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Language\Language;