Polish

See gh-759

Author: bclozel

spring-graphql-docs/modules/ROOT/pages/testing.adoc

@@ -269,14 +269,8 @@ The builder for this extension allows you to define HTTP request details:
 			.build();
 ----
 
-<<<<<<< HEAD:spring-graphql-docs/modules/ROOT/pages/testing.adoc
-Once `WebGraphQlServiceTester` is created, you can begin to
-xref:testing.adoc#testing.requests[execute requests] using the same API, independent of the underlying
-=======
 Once `WebGraphQlTester` is created, you can begin to
-<<testing.requests, execute requests>> using the same API, independent of the underlying
->>>>>>> 37f3f4a9 (Change WebGraphQlServiceTester to WebGraphQlTester):spring-graphql-docs/src/docs/asciidoc/includes/testing.adoc
-transport.
+xref:testing.adoc#testing.requests[execute requests] using the same API, independent of the underlying transport.