fix conflicts

Author: JPryce-Aklundh

antora.yml

@@ -6,4 +6,4 @@ nav:
 - modules/ROOT/content-nav.adoc
 asciidoc:
   attributes:
-    neo4j-version: '2025.02'
+    neo4j-version: '2025.03'

modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc

@@ -16,6 +16,34 @@ New features are added to the language continuously, and occasionally, some feat
 This section lists all of the features that have been removed, deprecated, added, or extended in different Cypher versions.
 Replacement syntax for deprecated and removed features are also indicated.
 
+[[cypher-deprecations-additions-removals-2025.03]]
+== Neo4j 2025.03
+
+=== New features
+
+[cols="2", options="header"]
+|===
+| Feature
+| Details
+
+a|
+label:functionality[]
+label:new[]
+[source, cypher, role=noheader]
+----
+UNWIND range(1, 100) AS i
+CALL (i) {
+    MERGE (u:User {id: i})
+    ON CREATE SET u.created = timestamp()
+} IN TRANSACTIONS ON ERROR RETRY 1 SECOND THEN FAIL
+----
+
+| New error handling option for `CALL { ... } IN TRANSACTIONS`: `ON ERROR RETRY`.
+This option applies an exponential delay between retries for transaction batches failing due to transient errors, with an optional maximum retry duration, and handles failure based on a specified fallback error mode if the transaction does not succeed within the given time.
+For more information, see xref:subqueries/subqueries-in-transactions#on-error-retry[`CALL` subqueries in transactions -> `ON ERROR RETRY`].
+
+|===
+
 [[cypher-deprecations-additions-removals-2025.01]]
 == Neo4j 2025.01
 

modules/ROOT/pages/subqueries/call-subquery.adoc

@@ -50,6 +50,7 @@ The variables returned in a subquery are available to the outer scope of the enc
 In this example, the `CALL` subquery executes three times, one for each row that the xref:clauses/unwind.adoc[`UNWIND`] clause outputs.
 
 .Query
+// tag::subqueries_call_subquery_basic_example[]
 [source, cypher]
 ----
 UNWIND [0, 1, 2] AS x
@@ -58,6 +59,8 @@ CALL () {
 }
 RETURN innerReturn
 ----
+// end::subqueries_call_subquery_basic_example[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="m"]
@@ -117,6 +120,7 @@ As a result, `CALL` subqueries can help maintain optimal performance and scalabi
 In this example, a `CALL` subquery is used to xref:functions/aggregating.adoc#functions-collect[`collect`] a `LIST` containing all players who play for a particular team.
 
 .Collect a list of all players playing for a particular team
+// tag::subqueries_call_subquery_variable_scope[]
 [source, cypher]
 ----
 MATCH (t:Team)
@@ -126,6 +130,8 @@ CALL (t) {
 }
 RETURN t AS team, players
 ----
+// end::subqueries_call_subquery_variable_scope[]
+
 
 .Result
 [source, role="queryresult",options="header,footer",cols="m,2m"]
@@ -457,6 +463,7 @@ RETURN p.name AS playerName, team.name AS team
 Note that no results are returned for `Player C`, since they are not connected to any `Team` with a `PLAYS_FOR` relationship.
 
 .Query using regular `OPTIONAL CALL`
+// tag::subqueries_call_subquery_optional_call[]
 [source, cypher]
 ----
 MATCH (p:Player)
@@ -466,10 +473,10 @@ OPTIONAL CALL (p) {
 }
 RETURN p.name AS playerName, team.name AS team
 ----
+// end::subqueries_call_subquery_optional_call[]
 
 Now all `Player` nodes, regardless of whether they have any `PLAYS_FOR` relationships connected to a `Team`, are returned.
 
-.Result
 .Result
 [role="queryresult",options="header,footer",cols="2*m"]
 |===
@@ -572,6 +579,7 @@ Call subqueries can be used to further process the results of a xref:clauses/uni
 This example query finds the youngest and the oldest `Player` in the graph.
 
 .Find the oldest and youngest players
+// tag::subqueries_call_subquery_union[]
 [source, cypher]
 ----
 CALL () {
@@ -587,6 +595,7 @@ UNION
 }
 RETURN p.name AS playerName, p.age AS age
 ----
+// end::subqueries_call_subquery_union[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]