Fix conflicts in merge_request_widget.json

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

@@ -119,7 +119,7 @@
     "can_push_to_source_branch": { "type": "boolean" },
     "rebase_path": { "type": ["string", "null"] },
     "squash": { "type": "boolean" },
-<<<<<<< HEAD
+    "test_reports_path": { "type": ["string", "null"] },
 
     // EE-specific
     "approvals_before_merge": { "type": ["integer", "null"] },
@@ -135,9 +135,6 @@
     },
     "vulnerability_feedback_path": { "type": "string" },
     "can_create_feedback": { "type": "boolean" }
-=======
-    "test_reports_path": { "type": ["string", "null"] }
->>>>>>> upstream/master
   },
   "additionalProperties": false
 }