Resolve MR diff API conflicts

lib/api/v3/merge_request_diffs.rb

@@ -22,11 +22,7 @@ module API
         get ":id/merge_requests/:merge_request_id/versions" do
           merge_request = find_merge_request_with_access(params[:merge_request_id])
 
-<<<<<<< HEAD
-          present paginate(merge_request.merge_request_diffs), with: ::API::Entities::MergeRequestDiff
-=======
           present merge_request.merge_request_diffs.order_id_desc, with: ::API::Entities::MergeRequestDiff
->>>>>>> upstream/master
         end
 
         desc 'Get a single merge request diff version' do