diff --git a/analyze/action.yml b/analyze/action.yml
index 41f3b5469..2abba7fa8 100644
--- a/analyze/action.yml
+++ b/analyze/action.yml
@@ -94,12 +94,6 @@ outputs:
   sarif-id:
     description: The ID of the uploaded SARIF file.
 runs:
-<<<<<<< HEAD
   using: node20
-  main: "../lib/analyze-action.js"
-  post: "../lib/analyze-action-post.js"
-=======
-  using: node24
   main: "../lib/analyze-entry.js"
   post: "../lib/analyze-post-entry.js"
->>>>>>> origin/releases/v4
diff --git a/autobuild/action.yml b/autobuild/action.yml
index 1af71a6da..dd8c9229d 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-action.js'
-=======
-  using: node24
   main: '../lib/autobuild-entry.js'
->>>>>>> origin/releases/v4
diff --git a/init/action.yml b/init/action.yml
index 73ef38adb..e3268577c 100644
--- a/init/action.yml
+++ b/init/action.yml
@@ -170,12 +170,6 @@ outputs:
   codeql-version:
     description: The version of the CodeQL binary used for analysis
 runs:
-<<<<<<< HEAD
   using: node20
-  main: '../lib/init-action.js'
-  post: '../lib/init-action-post.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 fd332fc72..5a96a3620 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-action.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 d610d8ca8..9bc38544c 100644
--- a/setup-codeql/action.yml
+++ b/setup-codeql/action.yml
@@ -54,10 +54,5 @@ outputs:
   codeql-version:
     description: The version of the CodeQL binary that was installed.
 runs:
-<<<<<<< HEAD
   using: node20
-  main: '../lib/setup-codeql-action.js'
-=======
-  using: node24
   main: '../lib/setup-codeql-entry.js'
->>>>>>> origin/releases/v4
diff --git a/start-proxy/action.yml b/start-proxy/action.yml
index 7abe0a2c1..7877d1e60 100644
--- a/start-proxy/action.yml
+++ b/start-proxy/action.yml
@@ -29,12 +29,6 @@ outputs:
   proxy_urls:
     description: A stringified JSON array of objects containing the types and URLs of the configured registries.
 runs:
-<<<<<<< HEAD
   using: node20
-  main: "../lib/start-proxy-action.js"
-  post: "../lib/start-proxy-action-post.js"
-=======
-  using: node24
   main: "../lib/start-proxy-entry.js"
   post: "../lib/start-proxy-post-entry.js"
->>>>>>> origin/releases/v4
diff --git a/upload-sarif/action.yml b/upload-sarif/action.yml
index 8cd3b5c77..93a36e4f9 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-action.js'
-  post: '../lib/upload-sarif-action-post.js'
-=======
-  using: node24
   main: '../lib/upload-sarif-entry.js'
   post: '../lib/upload-sarif-post-entry.js'
->>>>>>> origin/releases/v4