diff --git a/package.json b/package.json
index 2099cf8..6d918e2 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,8 @@
     "dev": "vite",
     "build": "vite build",
     "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
-<<<<<<< HEAD
     "preview": "vite preview"
     
-=======
-    "preview": "vite preview",
-    "dragbuild" : "vite build --base ./"
->>>>>>> 3d6cd81ed39210e2f6372e08c774c592d930027d
   },
   "dependencies": {
     "@emotion/react": "^11.11.1",