1 files changed, 1 insertions, 6 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb
index b2a544e1125..7eca56b2f48 100644
--- a/app/serializers/diff_file_entity.rb
+++ b/app/serializers/diff_file_entity.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class DiffFileEntity < DiffFileBaseEntity
+  include DiffFileConflictType
   include CommitsHelper
   include IconsHelper
   include Gitlab::Utils::StrongMemoize
@@ -88,10 +89,4 @@ class DiffFileEntity < DiffFileBaseEntity
     # If nothing is present, inline will be the default.
     options.fetch(:diff_view, :inline).to_sym
   end
-
-  def conflict_file(options, diff_file)
-    strong_memoize(:conflict_file) do
-      options[:conflicts] && options[:conflicts][diff_file.new_path]
-    end
-  end
 end