diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index 6696f3a..78f3b62 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -169,14 +169,11 @@ protected function setUp() {
     $this->typedConfigManager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface');
     $this->typedConfigManager->expects($this->any())
       ->method('getDefinition')
-<<<<<<< HEAD
-      ->will($this->returnValue(array('mapping' => array('id' => '', 'uuid' => '', 'dependencies' => ''))));
+      ->will($this->returnValue(array('mapping' => array('id' => '', 'uuid' => '', 'dependencies' => '', 'my_property' => ''))));
 
     $this->configManager = $this->getMock('Drupal\Core\Config\ConfigManagerInterface');
 
-=======
-      ->will($this->returnValue(array('mapping' => array('id' => '', 'uuid' => '', 'dependencies' => '', 'my_property' => ''))));
->>>>>>> Applying patch from issue 2411967 comment 9551695
+
     $container = new ContainerBuilder();
     $container->set('entity.manager', $this->entityManager);
     $container->set('config.typed', $this->typedConfigManager);