diff --git a/bootstrap/en/@home.texy b/bootstrap/en/@home.texy
index 0e80ab16c2..db6b6c6d68 100644
--- a/bootstrap/en/@home.texy
+++ b/bootstrap/en/@home.texy
@@ -93,4 +93,8 @@ $configurator->addDynamicParameters([
 ]);
 ```
 
+<<<<<<< patch-2
+The `remoteIp` parameter can be referenced in the configuration using the `%remoteIp%` notation.
+=======
 The `projectId` parameter can be referenced in the configuration using the `%projectId%` notation.
+>>>>>>> master