diff --git a/src/lint/linter/ArcanistMergeConflictLinter.php b/src/lint/linter/ArcanistMergeConflictLinter.php
index b4db9f9a..2affdf88 100644
--- a/src/lint/linter/ArcanistMergeConflictLinter.php
+++ b/src/lint/linter/ArcanistMergeConflictLinter.php
@@ -25,10 +25,6 @@ final class ArcanistMergeConflictLinter extends ArcanistLinter {
     return 'merge-conflict';
   }
 
-  public function willLintPaths(array $paths) {
-    return;
-  }
-
   public function lintPath($path) {
     $lines = phutil_split_lines($this->getData($path), false);