diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6
index 5b46dabe431..0abee3a000f 100644
--- a/app/assets/javascripts/merge_conflict_data_provider.js.es6
+++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6
@@ -95,8 +95,8 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
 
       for (let i = 0, len = linesObj.left.length; i < len; i++) {
         file.parallelLines.push([
-          linesObj.left[i],
-          linesObj.right[i]
+          linesObj.right[i],
+          linesObj.left[i]
         ]);
       }