resolved conflict

Author: AlexicaWright

modules/ROOT/pages/introduction.adoc

@@ -14,11 +14,7 @@ Each HTTP request can include a list of statements, and for convenience you can
 
 The server guards against orphaned transactions by using a timeout.
 If there are no requests for a given transaction within the timeout period, the server will roll it back.
-<<<<<<< HEAD
 You can configure the timeout in the server configuration, by setting link:{neo4j-docs-base-uri}/operations-manual/{page-version}/configuration/configuration-settings#config_dbms.rest.transaction.idle_timeout[`dbms.rest.transaction.idle_timeout`] to the number of seconds before timeout.
-=======
-You can configure the timeout in the server configuration, by setting link:{neo4j-docs-base-uri}/operations-manual/{page-version}/configuration/configuration-settings#config_dbms.rest.transaction.idle_timeout[Operations Manual -> Configuration settings `dbms.rest.transaction.idle_timeout`] to the number of seconds before timeout.
->>>>>>> 77386b0... update the link to configs
 The default timeout is `60` seconds.
 
 Responses from the HTTP API can be transmitted as JSON streams, resulting in better performance and lower memory overhead on the server side.