diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2bfade916..e19ea4f0f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,14 +4,9 @@ on:
   push:
     branches:
       - main
-<<<<<<< HEAD
-      - node-migration-clean
     paths:
       - packages/**
       - .github/**
-=======
-  workflow_dispatch:
->>>>>>> 1a717ddc7d97e31d3775747df9df153729d2925d
 
 jobs:
   path-filter:
diff --git a/site/package.json b/site/package.json
index a6d93f783..6ec897f81 100644
--- a/site/package.json
+++ b/site/package.json
@@ -1,12 +1,8 @@
 {
   "name": "site",
   "version": "0.0.0",
-<<<<<<< HEAD:apps/site/package.json
-  "license": "Apache 2.0",
-=======
   "private": false,
   "license": "Apache-2.0",
->>>>>>> 1a717ddc7d97e31d3775747df9df153729d2925d:site/package.json
   "scripts": {
     "docusaurus": "docusaurus",
     "start": "docusaurus start --host 0.0.0.0",
@@ -36,12 +32,8 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "2.2.0",
     "@tsconfig/docusaurus": "^1.0.4",
-<<<<<<< HEAD:apps/site/package.json
-    "typescript": "^4.9.3"
-=======
     "@types/chart.js": "^2.9.37",
-    "typescript": "^4.5.2"
->>>>>>> 1a717ddc7d97e31d3775747df9df153729d2925d:site/package.json
+    "typescript": "^4.9.3"
   },
   "browserslist": {
     "production": [