diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fc037dda3e7..d8399041af9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,11 +23,19 @@ repos:
     rev: v0.2.0
     hooks:
       - id: ruff
+<<<<<<< HEAD
         name: "Run ruff linter and apply fixes"
         args: ["--fix"]
+=======
+        name: "Run ruff import sorter"
+        args: ["--select=I", "--fix"]
+
+      - id: ruff
+        name: "Run ruff linter"
+>>>>>>> 229fc715c9 (ci: ruff only fix imports)
 
       - id: ruff-format
-        name: "Format Python code"
+        name: "Run ruff formatter"
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.7.1