diff --git a/package.json b/package.json
index 0d9c45995..0d324327e 100644
--- a/package.json
+++ b/package.json
@@ -13,19 +13,10 @@
     "tailwindcss": "lib/cli.js"
   },
   "scripts": {
-<<<<<<< HEAD
-    "prebuild": "npm run generate && rimraf lib",
-    "build": "swc src --out-dir lib --copy-files",
-    "postbuild": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js",
-    "rebuild-fixtures": "npm run build && node -r @swc/register scripts/rebuildFixtures.js",
-    "prepublishOnly": "npm install --force && npm run build",
-=======
     "preswcify": "npm run generate && rimraf lib",
     "swcify": "swc src --out-dir lib --copy-files",
     "postswcify": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js",
     "rebuild-fixtures": "npm run swcify && node -r @swc/register scripts/rebuildFixtures.js",
-    "prepublishOnly": "npm install --force && npm run oxide:install --force && npm run oxide:build",
->>>>>>> 593bb486 (use oxide)
     "style": "eslint .",
     "pretest": "npm run generate",
     "test": "jest",