diff --git a/flow360/version.py b/flow360/version.py
index c60d069f8..5a5887661 100644
--- a/flow360/version.py
+++ b/flow360/version.py
@@ -2,5 +2,10 @@
 version
 """
 
+<<<<<<< HEAD
 __version__ = "25.9.8"
 __solver_version__ = "release-25.9"
+=======
+__version__ = "25.8.9"
+__solver_version__ = "release-25.8"
+>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
diff --git a/pyproject.toml b/pyproject.toml
index 73fb1f7f8..ae4bac0c8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,10 @@
 [tool.poetry]
 name = "flow360"
+<<<<<<< HEAD
 version = "v25.9.8"
+=======
+version = "v25.8.9"
+>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
 description = "Flow360 Python Client"
 authors = ["Flexcompute <support@flexcompute.com>"]
 
diff --git a/tests/ref/simulation/service_init_geometry.json b/tests/ref/simulation/service_init_geometry.json
index 565876caf..6831ca2b3 100644
--- a/tests/ref/simulation/service_init_geometry.json
+++ b/tests/ref/simulation/service_init_geometry.json
@@ -1,4 +1,11 @@
 {
+<<<<<<< HEAD
+=======
+    "version": "25.8.9",
+    "unit_system": {
+        "name": "SI"
+    },
+>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
     "meshing": {
         "defaults": {
             "boundary_layer_growth_rate": 1.2,
diff --git a/tests/ref/simulation/service_init_surface_mesh.json b/tests/ref/simulation/service_init_surface_mesh.json
index 17a08e90e..bbfe0b2ed 100644
--- a/tests/ref/simulation/service_init_surface_mesh.json
+++ b/tests/ref/simulation/service_init_surface_mesh.json
@@ -1,4 +1,11 @@
 {
+<<<<<<< HEAD
+=======
+    "version": "25.8.9",
+    "unit_system": {
+        "name": "SI"
+    },
+>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
     "meshing": {
         "defaults": {
             "boundary_layer_growth_rate": 1.2,
diff --git a/tests/ref/simulation/service_init_volume_mesh.json b/tests/ref/simulation/service_init_volume_mesh.json
index cf81bb42c..917508fd7 100644
--- a/tests/ref/simulation/service_init_volume_mesh.json
+++ b/tests/ref/simulation/service_init_volume_mesh.json
@@ -1,4 +1,118 @@
 {
+<<<<<<< HEAD
+=======
+    "version": "25.8.9",
+    "unit_system": {
+        "name": "SI"
+    },
+    "reference_geometry": {
+        "moment_center": {
+            "value": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "units": "m"
+        },
+        "moment_length": {
+            "value": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "units": "m"
+        },
+        "area": {
+            "type_name": "number",
+            "value": 1.0,
+            "units": "m**2"
+        }
+    },
+    "operating_condition": {
+        "type_name": "AerospaceCondition",
+        "private_attribute_constructor": "default",
+        "private_attribute_input_cache": {
+            "alpha": {
+                "value": 0.0,
+                "units": "degree"
+            },
+            "beta": {
+                "value": 0.0,
+                "units": "degree"
+            },
+            "thermal_state": {
+                "type_name": "ThermalState",
+                "private_attribute_constructor": "default",
+                "private_attribute_input_cache": {},
+                "temperature": {
+                    "value": 288.15,
+                    "units": "K"
+                },
+                "density": {
+                    "value": 1.225,
+                    "units": "kg/m**3"
+                },
+                "material": {
+                    "type": "air",
+                    "name": "air",
+                    "dynamic_viscosity": {
+                        "reference_viscosity": {
+                            "value": 1.716e-05,
+                            "units": "Pa*s"
+                        },
+                        "reference_temperature": {
+                            "value": 273.15,
+                            "units": "K"
+                        },
+                        "effective_temperature": {
+                            "value": 110.4,
+                            "units": "K"
+                        }
+                    }
+                }
+            }
+        },
+        "alpha": {
+            "value": 0.0,
+            "units": "degree"
+        },
+        "beta": {
+            "value": 0.0,
+            "units": "degree"
+        },
+        "thermal_state": {
+            "type_name": "ThermalState",
+            "private_attribute_constructor": "default",
+            "private_attribute_input_cache": {},
+            "temperature": {
+                "value": 288.15,
+                "units": "K"
+            },
+            "density": {
+                "value": 1.225,
+                "units": "kg/m**3"
+            },
+            "material": {
+                "type": "air",
+                "name": "air",
+                "dynamic_viscosity": {
+                    "reference_viscosity": {
+                        "value": 1.716e-05,
+                        "units": "Pa*s"
+                    },
+                    "reference_temperature": {
+                        "value": 273.15,
+                        "units": "K"
+                    },
+                    "effective_temperature": {
+                        "value": 110.4,
+                        "units": "K"
+                    }
+                }
+            }
+        }
+    },
+>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
     "models": [
         {
             "entities": {
diff --git a/tests/simulation/converter/ref/ref_monitor.json b/tests/simulation/converter/ref/ref_monitor.json
index 3eaf1a580..008a1681b 100644
--- a/tests/simulation/converter/ref/ref_monitor.json
+++ b/tests/simulation/converter/ref/ref_monitor.json
@@ -1,4 +1,11 @@
 {
+<<<<<<< HEAD
+=======
+    "version": "25.8.9",
+    "unit_system": {
+        "name": "SI"
+    },
+>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))
     "models": [
         {
             "initial_condition": {
diff --git a/tests/test_current_flow360_version.py b/tests/test_current_flow360_version.py
index 372d13f65..8ab33ad6d 100644
--- a/tests/test_current_flow360_version.py
+++ b/tests/test_current_flow360_version.py
@@ -2,4 +2,8 @@
 
 
 def test_version():
+<<<<<<< HEAD
     assert __version__ == "25.9.8"
+=======
+    assert __version__ == "25.8.9"
+>>>>>>> 515c4238 ([Hotfix 25.8]: use params entity registry for update_persistent_entities (#2046))