diff --git a/.gitea/workflows/run-hcdc.yaml b/.gitea/workflows/run-hcdc.yaml
index 24fce85ef..4185c7ca7 100644
--- a/.gitea/workflows/run-hcdc.yaml
+++ b/.gitea/workflows/run-hcdc.yaml
@@ -1,8 +1,4 @@
-<<<<<<< Updated upstream
-name: Check for illegal characters
-=======
-# name: Run HCDC
->>>>>>> Stashed changes
+# name: Check for illegal characters
 
 # on:
 #   pull_request_target: