diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bb3c639..facf9cc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -47,6 +47,22 @@ repos:
         args:
           - --strict
 
+<<<<<<< HEAD
+=======
+  # GitHub Actions hooks
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.14.2
+    hooks:
+      - id: check-github-actions
+      - id: check-github-workflows
+
+  # pre-commit hooks
+  - repo: https://github.com/pre-commit/pre-commit
+    rev: v2.17.0
+    hooks:
+      - id: validate_manifest
+
+>>>>>>> 4215ba378ea264221cddf6ee6d0cecfe7a2add31
   # Shell script hooks
   - repo: https://github.com/cisagov/pre-commit-shfmt
     rev: v0.0.2