diff --git a/pyproject.toml b/pyproject.toml
index 065a375ad..f335b137e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -118,7 +118,7 @@ ring-flash-attn = [
 
 # Deep learning frameworks
 deepspeed = [
-    "deepspeed>=0.17.0",  # Allow newer versions
+    "deepspeed>=0.17.5",
     "deepspeed-kernels",
 ]
 
diff --git a/setup.py b/setup.py
index 35c5130b0..5d3265142 100644
--- a/setup.py
+++ b/setup.py
@@ -6,6 +6,7 @@ All configuration is now in pyproject.toml.
 
 from setuptools import setup
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 from setuptools import find_packages, setup
 
@@ -181,6 +182,7 @@ setup(
     extras_require=extras_require_build,
 )
 =======
+=======
+>>>>>>> 7212dc6c (rebase)
 if __name__ == "__main__":
     setup()
->>>>>>> 01544ca0 (wip)
diff --git a/src/axolotl/_version.py b/src/axolotl/_version.py
new file mode 100644
index 000000000..142bcbd1f
--- /dev/null
+++ b/src/axolotl/_version.py
@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.12.1.dev89+g6477e622e.d20250915'
+__version_tuple__ = version_tuple = (0, 12, 1, 'dev89', 'g6477e622e.d20250915')
+
+__commit_id__ = commit_id = 'g6477e622e'