fix .pre-commit-config.yaml and default arguments

Author: eshort0401

.pre-commit-config.yaml

@@ -24,11 +24,7 @@ repos:
       - id: rst-inline-touching-normal
       - id: text-unicode-replacement-char
   - repo: https://github.com/astral-sh/ruff-pre-commit
-<<<<<<< HEAD
     rev: v0.14.7
-=======
-    rev: v0.14.6
->>>>>>> 456f9536 (implement vectorized method and dask extension)
     hooks:
       - id: ruff-check
         args: ["--fix", "--show-fixes"]
@@ -80,10 +76,6 @@ repos:
       - id: validate-pyproject
         additional_dependencies: ["validate-pyproject-schema-store[all]"]
   - repo: https://github.com/adhtruong/mirrors-typos
-<<<<<<< HEAD
     rev: v1.40.0
-=======
-    rev: v1.39.2
->>>>>>> 456f9536 (implement vectorized method and dask extension)
     hooks:
       - id: typos

doc/contribute/contributing.rst

@@ -247,7 +247,8 @@ You can either run pre-commit manually via Pixi as described above, or set up gi
 
 This is done by:
 
-.. code-block:: sh
+.. code-block:: shell
+
     pixi shell -e pre-commit # enter the pre-commit environment
     pre-commit install # install the git hooks