Should be fine

.github/workflows/space.yml

@@ -1,9 +1,5 @@
 name: Sync to Hugging Face Space
-<<<<<<< HEAD
-# This workflow syncs the repository to a Hugging Face Space on push to main branch or manually via workflow dispatch
-=======
 # This workflow syncs the repository to a Hugging Face Space on push to main branch or manually via workflow dispatch.
->>>>>>> 55f1c13714599b83bc6c717c3c5a563d83b59340
 on:
   push:
     branches: [main]

.pre-commit-config.yaml

@@ -1,7 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
     rev: 24.3.0
-<<<<<<< HEAD
     hooks: [ {id: black, language_version: python3} ]
 
   - repo: https://github.com/PyCQA/isort
@@ -12,23 +11,10 @@ repos:
     rev: 7.0.0
     hooks: [ {id: flake8} ]
 
+  # ---- fix starts here ----
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.2.4
-=======
-    hooks:
-      - id: black
-        language_version: python3
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.0
-    hooks:
-      - id: isort
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
-    hooks:
-      - id: flake8
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.2.5
->>>>>>> 55f1c13714599b83bc6c717c3c5a563d83b59340
+    # use latest mirrored tag that exists (or a commit hash)
+    rev: v3.2.4          # ✅  tag present in the mirror
     hooks:
       - id: prettier
         additional_dependencies: [prettier-plugin-json-sort]