Adjust merge_request.json schema conflicts

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

@@ -94,7 +94,6 @@
     "commit_change_content_path": { "type": "string" },
     "remove_wip_path": { "type": "string" },
     "commits_count": { "type": "integer" },
-<<<<<<< HEAD
     "merge_ongoing": { "type": "boolean" },
     "remove_source_branch": { "type": ["boolean", "null"] },
     // EE-specific
@@ -112,10 +111,6 @@
       "head_path": { "type": "string" },
       "base_path": { "type": "string" }
     }
-=======
-    "remove_source_branch": { "type": ["boolean", "null"] },
-    "merge_ongoing": { "type": "boolean" }
->>>>>>> upstream/master
   },
   "additionalProperties": false
 }