diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -389,7 +389,6 @@
     'DifferentialCommitsField' => 'applications/differential/customfield/DifferentialCommitsField.php',
     'DifferentialConduitAPIMethod' => 'applications/differential/conduit/DifferentialConduitAPIMethod.php',
     'DifferentialConflictsCommitMessageField' => 'applications/differential/field/DifferentialConflictsCommitMessageField.php',
-    'DifferentialConflictsField' => 'applications/differential/customfield/DifferentialConflictsField.php',
     'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
     'DifferentialCoreCustomField' => 'applications/differential/customfield/DifferentialCoreCustomField.php',
     'DifferentialCreateCommentConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php',
@@ -5034,7 +5033,6 @@
     'DifferentialCommitsField' => 'DifferentialCustomField',
     'DifferentialConduitAPIMethod' => 'ConduitAPIMethod',
     'DifferentialConflictsCommitMessageField' => 'DifferentialCommitMessageField',
-    'DifferentialConflictsField' => 'DifferentialCustomField',
     'DifferentialController' => 'PhabricatorController',
     'DifferentialCoreCustomField' => 'DifferentialCustomField',
     'DifferentialCreateCommentConduitAPIMethod' => 'DifferentialConduitAPIMethod',
diff --git a/src/applications/differential/customfield/DifferentialConflictsField.php b/src/applications/differential/customfield/DifferentialConflictsField.php
deleted file mode 100644
--- a/src/applications/differential/customfield/DifferentialConflictsField.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * This field doesn't do anything, it just parses the "Conflicts:" field which
- * `git` can insert after a merge, so we don't squish the field value into
- * some other field.
- */
-final class DifferentialConflictsField
-  extends DifferentialCustomField {
-
-  public function getFieldKey() {
-    return 'differential:conflicts';
-  }
-
-  public function getFieldKeyForConduit() {
-    return 'conflicts';
-  }
-
-  public function getFieldName() {
-    return pht('Conflicts');
-  }
-
-  public function getFieldDescription() {
-    return pht(
-      'Parses the "%s" field which Git can inject into commit messages.',
-      'Conflicts');
-  }
-
-  public function canDisableField() {
-    return false;
-  }
-
-  public function shouldAppearInCommitMessage() {
-    return true;
-  }
-
-  public function shouldAllowEditInCommitMessage() {
-    return false;
-  }
-
-  public function renderCommitMessageValue(array $handles) {
-    return null;
-  }
-
-}