diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d8882be..d9be52c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,5 @@
 ---
+<<<<<<< HEAD
 ci:
   skip:
     # pre-commit.ci has trouble with this one
@@ -6,6 +7,13 @@ ci:
     - black
     - end-of-file-fixer
     - trailing-whitespace
+||||||| parent of 681ca40 (No update docs)
+=======
+ci:
+  skip:
+    # pre-commit.ci has trouble with this one
+    - update-docs
+>>>>>>> 681ca40 (No update docs)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.1.0