Resolve conflicts in spec/fixtures/api/schemas/public_api/v4/merge_requests.json

spec/fixtures/api/schemas/public_api/v4/merge_requests.json

@@ -75,10 +75,7 @@
       "force_remove_source_branch": { "type": ["boolean", "null"] },
       "discussion_locked": { "type": ["boolean", "null"] },
       "web_url": { "type": "uri" },
-<<<<<<< HEAD
       "approvals_before_merge": { "type": ["integer", "null"] },
-=======
->>>>>>> upstream/master
       "squash": { "type": "boolean" },
       "time_stats": {
         "time_estimate": { "type": "integer" },
@@ -96,11 +93,7 @@
       "labels", "work_in_progress", "milestone", "merge_when_pipeline_succeeds",
       "merge_status", "sha", "merge_commit_sha", "user_notes_count",
       "should_remove_source_branch", "force_remove_source_branch",
-<<<<<<< HEAD
       "web_url", "approvals_before_merge", "squash"
-=======
-      "web_url", "squash"
->>>>>>> upstream/master
     ],
     "additionalProperties": false
   }