link fixes

Author: JPryce-Aklundh

modules/ROOT/pages/queries/select-version.adoc

@@ -106,13 +106,8 @@ For more information about how to change and view the default language of new an
 * link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/composite-databases/alter-composite-databases/#alter-default-language-composite-database[Alter the default Cypher version of a composite database]
 * link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/#alter-default-language-remote-database-alias[Alter the default Cypher version of a remote database alias]
 * link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/standard-databases/listing-databases/#_show_the_default_cypher_version_of_a_database[Show the default Cypher version of a database]
-<<<<<<< HEAD
-* link:{neo4j-docs-base-uri}/operations-manual/authentication-authorization/dbms-administration/#_grant_privilege_to_modify_the_default_language_of_standard_databases[Grant privilege to modify the default language of standard databases]
-* link:{neo4j-docs-base-uri}/operations-manual/authentication-authorization/dbms-administration/#_grant_privilege_to_modify_composite_databases[Grant privilege to modify composite databases] (required in order to alter the default language of a composite database)
-=======
 * link:{neo4j-docs-base-uri}/operations-manual/current/authentication-authorization/dbms-administration/#_grant_privilege_to_modify_the_default_language_of_standard_databases[Grant privilege to modify the default language of standard databases]
 * link:{neo4j-docs-base-uri}/operations-manual/current/authentication-authorization/dbms-administration/#grant-privilege-alter-composite-database[Grant privilege to modify composite databases] (required in order to alter the default language of a composite database)
->>>>>>> 1da5417c (Fix links to ops manual for select Cypher versions (#1351))
 
 For information about Cypher versions and DBMS upgrades, see the link:{neo4j-docs-base-uri}/upgrade-migration-guide/current/#_cypher_versions[Upgrade and migration guide -> Cypher versions].