diff --git a/.gitea/workflows/markdown-linters.yaml b/.gitea/workflows/markdown-linters.yaml
index 6e27650..10aa128 100644
--- a/.gitea/workflows/markdown-linters.yaml
+++ b/.gitea/workflows/markdown-linters.yaml
@@ -9,15 +9,10 @@ on:
 
 jobs:
   markdown-lint:
-<<<<<<< HEAD
-    container:
-      image: git.cryptic.systems/volker.raschek/markdownlint:0.44.0
-=======
->>>>>>> 900dac0 (chore(ci): use DavidAnson/markdownlint-cli2-action)
     runs-on:
     - ubuntu-latest
     steps:
     - uses: actions/checkout@v4.2.2
-    - uses: DavidAnson/markdownlint-cli2-action@v19.1.0
+    - uses: DavidAnson/markdownlint-cli2-action@v20.0.0
       with:
         globs: '**/*.md'