fix procedure formatting

Author: JPryce-Aklundh

modules/ROOT/pages/genai-integrations.adoc

@@ -78,11 +78,7 @@ db.create.setNodeVectorProperty(node :: NODE, key :: STRING, vector :: ANY)
 
 Use the `db.create.setRelationshipVectorProperty()` procedure to store an embedding to a relationship property.
 
-<<<<<<< HEAD
-.Signature for `db.create.setRelationshipVectorProperty` label:procedure[] label:new[Introduced in 5.18]
-=======
-.Signature for `db.create.setRelationshipVectorProperty()` label:procedure[] 
->>>>>>> f17b4060 (standardise procedure formatting to use `()` (#1389))
+.Signature for `db.create.setRelationshipVectorProperty()` label:procedure[] label:new[Introduced in 5.18]
 [source,syntax]
 ----
 db.create.setRelationshipVectorProperty(relationship :: RELATIONSHIP, key :: STRING, vector :: ANY)