Fix conflicts in doc/api/merge_requests.md

doc/api/merge_requests.md

@@ -312,11 +312,7 @@ Parameters:
     "human_time_estimate": null,
     "human_total_time_spent": null
   },
-<<<<<<< HEAD
-  "approvals_before_merge": null
-  },
-=======
->>>>>>> upstream/master
+  "approvals_before_merge": null,
   "closed_at": "2018-01-19T14:36:11.086Z",
   "latest_build_started_at": null,
   "latest_build_finished_at": null,