Resolved conflicts in doc/api/README.md

doc/api/README.md

@@ -25,10 +25,7 @@ The following API resources are available:
 - [Epics](epics.md) **[ULTIMATE]**
 - [Events](events.md)
 - [Feature flags](features.md)
-<<<<<<< HEAD
 - [Geo Nodes](geo_nodes.md) **[PREMIUM]**
-=======
->>>>>>> upstream/master
 - Group-related resources, including:
   - [Groups](groups.md)
   - [Group access requests](access_requests.md)
@@ -39,20 +36,14 @@ The following API resources are available:
   - [Group milestones](group_milestones.md)
 - [Issues](issues.md)
 - [Issue boards](boards.md)
-<<<<<<< HEAD
 - [Issue links](issue_links.md)
-=======
->>>>>>> upstream/master
 - [Jobs](jobs.md)
 - [Keys](keys.md)
 - [Labels](labels.md)
 - [License](license.md)
 - [Managed licenses](managed_licenses.md) **[ULTIMATE]**
 - [Markdown](markdown.md)
-<<<<<<< HEAD
 - [Merge request approvals](merge_request_approvals.md) **[STARTER]**
-=======
->>>>>>> upstream/master
 - [Merge requests](merge_requests.md)
 - [Namespaces](namespaces.md)
 - [Notes](notes.md) (comments)