diff --git a/app/src/Model/Table/IdentifiersTable.php b/app/src/Model/Table/IdentifiersTable.php
index 7337eccb4..5c7dad46d 100644
--- a/app/src/Model/Table/IdentifiersTable.php
+++ b/app/src/Model/Table/IdentifiersTable.php
@@ -41,11 +41,8 @@ class IdentifiersTable extends Table {
   use \App\Lib\Traits\ChangelogBehaviorTrait;
   use \App\Lib\Traits\CoLinkTrait;
   use \App\Lib\Traits\HistoryTrait;
-<<<<<<< HEAD
   use \App\Lib\Traits\LabeledLogTrait;
-=======
   use \App\Lib\Traits\LayoutTrait;
->>>>>>> 63c59680 (Render Enrollment Attributes edit/add/view in a modal)
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\ProvisionableTrait;