Cleanup rebase conflicts

lib/gitlab/diff/highlight_cache.rb

@@ -68,17 +68,10 @@ module Gitlab
         end
       end
 
-<<<<<<< HEAD
       def cacheable_files
         strong_memoize(:cacheable_files) do
-          diff_files = @diff_collection.diff_files
-
           diff_files.select { |file| cacheable?(file) && read_file(file).nil? }
         end
-=======
-      def uncached_files
-        diff_files.select { |file| read_cache[file.file_path].nil? }
->>>>>>> Allow diff_files to return undecorated files
       end
 
       # Given a hash of: