diff --git a/.upm/store.json b/.upm/store.json
index be7f137b38a7418ba18d379e88a8c52c2c57489e..de88213299ffdd246f3f7702aed258ead1400a79 100644
--- a/.upm/store.json
+++ b/.upm/store.json
@@ -1 +1 @@
-{"version":2,"languages":{"nodejs-yarn":{"specfileHash":"abab35c9ba66256c189aa42c5e29aa02","lockfileHash":"b4fe953f33f9be5c0086b24be0e7aad5"}}}
+{"version":2,"languages":{"nodejs-yarn":{"specfileHash":"88b15dbac007735f98d1d471fe729c93","lockfileHash":"b4fe953f33f9be5c0086b24be0e7aad5"}}}
diff --git a/package.json b/package.json
index 5ea06b2f93785343e3bf5ba9bc2f5c34d277454a..874c9c6d2892fb4859a5d82ee3e7f400cf1c0fa0 100644
--- a/package.json
+++ b/package.json
@@ -6,11 +6,7 @@
   "description": "Minecraft clone made with Three.js and TypeScript",
   "scripts": {
     "dev": "vite",
-<<<<<<< HEAD
-    "build": "vite build",
-=======
     "build": "vite build --base=/dist/",
->>>>>>> 8e27e4d91d171fdca6522f4297ff30d0fdedccd0
     "preview": "vite preview --port 8080",
     "lint": "tsc --noEmit"
   },