Fix conflicts in merge_request_widget.json spec

spec/fixtures/api/schemas/entities/merge_request_widget.json

@@ -108,7 +108,6 @@
     "rebase_commit_sha": { "type": ["string", "null"] },
     "rebase_in_progress": { "type": "boolean" },
     "can_push_to_source_branch": { "type": "boolean" },
-<<<<<<< HEAD
     "rebase_path": { "type": ["string", "null"] },
 
     // EE-specific
@@ -122,9 +121,6 @@
       "base_path": { "type": "string" },
       "base_blob_path": { "type": "string" }
     }
-=======
-    "rebase_path": { "type": ["string", "null"] }
->>>>>>> upstream/master
   },
   "additionalProperties": false
 }