diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index dafebe945..1760abb63 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,7 +20,6 @@ on:
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
->>>>>>> 0.4.0
   schedule:
     - cron: '22 3 * * 5'