From 64f0f7b6de79177c1f6c912ad7169c4e332e4572 Mon Sep 17 00:00:00 2001
From: Ben <106089368+benflexcompute@users.noreply.github.com>
Date: Fri, 27 Mar 2026 19:02:30 -0400
Subject: [PATCH] Update version (#1940)

---
 flow360/version.py                                          | 4 ++++
 pyproject.toml                                              | 4 ++++
 tests/simulation/ref/simulation_with_project_variables.json | 4 ++++
 tests/test_current_flow360_version.py                       | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/flow360/version.py b/flow360/version.py
index ab5f7810e..77b06afbc 100644
--- a/flow360/version.py
+++ b/flow360/version.py
@@ -2,5 +2,9 @@
 version
 """
 
+<<<<<<< HEAD
 __version__ = "25.10.0b1"
+=======
+__version__ = "25.9.6"
+>>>>>>> fcd9ca7f (Update version (#1940))
 __solver_version__ = "release-25.9"
diff --git a/pyproject.toml b/pyproject.toml
index 238333842..438cd7273 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,10 @@
 [tool.poetry]
 name = "flow360"
+<<<<<<< HEAD
 version = "v25.10.0b1"
+=======
+version = "v25.9.6"
+>>>>>>> fcd9ca7f (Update version (#1940))
 description = "Flow360 Python Client"
 authors = ["Flexcompute <support@flexcompute.com>"]
 
diff --git a/tests/simulation/ref/simulation_with_project_variables.json b/tests/simulation/ref/simulation_with_project_variables.json
index 617481c08..6dafee42e 100644
--- a/tests/simulation/ref/simulation_with_project_variables.json
+++ b/tests/simulation/ref/simulation_with_project_variables.json
@@ -421,5 +421,9 @@
         "name": "SI"
     },
     "user_defined_fields": [],
+<<<<<<< HEAD
     "version": "25.9.3b1"
+=======
+    "version": "25.9.6"
+>>>>>>> fcd9ca7f (Update version (#1940))
 }
diff --git a/tests/test_current_flow360_version.py b/tests/test_current_flow360_version.py
index 427d5fd60..8b507ae5f 100644
--- a/tests/test_current_flow360_version.py
+++ b/tests/test_current_flow360_version.py
@@ -4,6 +4,7 @@
 
 
 def test_version():
+<<<<<<< HEAD
     assert __version__ == "25.10.0b1"
 
 
@@ -18,3 +19,6 @@ def test_solver_version_matches_module_version():
         f"__solver_version__ is '{__solver_version__}' but expected '{expected}' "
         f"for module version '{__version__}'"
     )
+=======
+    assert __version__ == "25.9.6"
+>>>>>>> fcd9ca7f (Update version (#1940))