Fix conflict in doc/api/README.md

doc/api/README.md

@@ -62,21 +62,16 @@ The following documentation is for the [internal CI API](ci/README.md):
 
 ## Road to GraphQL
 
-API v4 will be the last REST API that we support. Going forward, we will start
-on moving to GraphQL and deprecate the use of controller-specific
-endpoints. GraphQL has a number of benefits:
+Going forward, we will start on moving to
+[GraphQL](http://graphql.org/learn/best-practices/) and deprecate the use of
+controller-specific endpoints. GraphQL has a number of benefits:
 
 1. We avoid having to maintain two different APIs.
 2. Callers of the API can request only what they need.
-<<<<<<< HEAD
-
-### Internal CI API
-=======
 3. It is versioned by default.
 
 It will co-exist with the current v4 REST API. If we have a v5 API, this should
 be a compatibility layer on top of GraphQL.
->>>>>>> f8740d5... Merge branch 'docs/personal-access-tokens' into 'master'
 
 ## Authentication