diff --git a/autobuild/action.yml b/autobuild/action.yml
index 72b76e5c3..f28c8eb46 100644
--- a/autobuild/action.yml
+++ b/autobuild/action.yml
@@ -13,10 +13,5 @@ inputs:
       $GITHUB_WORKSPACE as its working directory.
     required: false
 runs:
-<<<<<<< HEAD
   using: 'node12'
   main: '../lib/autobuild-action.js'
-=======
-  using: 'node16'
-  main: '../lib/autobuild-action.js'
->>>>>>> origin/releases/v2