diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index ec6c950..45d0eb6 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-name: Publish
-
-=======
 name: Release
->>>>>>> dc288086ec2b6df28624016c9067ba30365635a7
 on:
   workflow_dispatch:
   push: