diff --git a/autobuild/action.yml b/autobuild/action.yml
index 54b9128b6..a4b706b34 100644
--- a/autobuild/action.yml
+++ b/autobuild/action.yml
@@ -15,10 +15,5 @@ inputs:
       $GITHUB_WORKSPACE as its working directory.
     required: false
 runs:
-<<<<<<< HEAD
   using: node20
-  main: '../lib/autobuild-entry.js'
-=======
-  using: node24
   main: "../lib/autobuild-entry.js"
->>>>>>> origin/releases/v4
diff --git a/init/action.yml b/init/action.yml
index 299bb9138..806554458 100644
--- a/init/action.yml
+++ b/init/action.yml
@@ -180,12 +180,6 @@ outputs:
   codeql-version:
     description: The version of the CodeQL binary used for analysis
 runs:
-<<<<<<< HEAD
   using: node20
-  main: '../lib/init-entry.js'
-  post: '../lib/init-post-entry.js'
-=======
-  using: node24
   main: "../lib/init-entry.js"
   post: "../lib/init-post-entry.js"
->>>>>>> origin/releases/v4
diff --git a/resolve-environment/action.yml b/resolve-environment/action.yml
index 770abfac9..2a14363b3 100644
--- a/resolve-environment/action.yml
+++ b/resolve-environment/action.yml
@@ -21,10 +21,5 @@ outputs:
   environment:
     description: The inferred build environment configuration.
 runs:
-<<<<<<< HEAD
   using: node20
-  main: '../lib/resolve-environment-entry.js'
-=======
-  using: node24
   main: "../lib/resolve-environment-entry.js"
->>>>>>> origin/releases/v4
diff --git a/setup-codeql/action.yml b/setup-codeql/action.yml
index c0ab481d2..38e6e68bf 100644
--- a/setup-codeql/action.yml
+++ b/setup-codeql/action.yml
@@ -51,10 +51,5 @@ outputs:
   codeql-version:
     description: The version of the CodeQL binary that was installed.
 runs:
-<<<<<<< HEAD
   using: node20
-  main: '../lib/setup-codeql-entry.js'
-=======
-  using: node24
   main: "../lib/setup-codeql-entry.js"
->>>>>>> origin/releases/v4
diff --git a/upload-sarif/action.yml b/upload-sarif/action.yml
index d56587e62..dbfe45793 100644
--- a/upload-sarif/action.yml
+++ b/upload-sarif/action.yml
@@ -41,12 +41,6 @@ outputs:
 
       { "code-scanning": "some-id", "code-quality": "some-other-id" }
 runs:
-<<<<<<< HEAD
   using: node20
-  main: '../lib/upload-sarif-entry.js'
-  post: '../lib/upload-sarif-post-entry.js'
-=======
-  using: node24
   main: "../lib/upload-sarif-entry.js"
   post: "../lib/upload-sarif-post-entry.js"
->>>>>>> origin/releases/v4