diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
index 4d766fd..2196d39 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
@@ -7,12 +7,7 @@
 
 namespace Drupal\taxonomy;
 
-<<<<<<< HEAD
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityFormControllerNG;
-=======
-use Drupal\Core\Entity\EntityFormController;
->>>>>>> First pass.
 
 /**
  * Base for controller for taxonomy term edit forms.