diff --git a/apps/x/packages/core/package.json b/apps/x/packages/core/package.json
index bb9d1cb7..3e162a02 100644
--- a/apps/x/packages/core/package.json
+++ b/apps/x/packages/core/package.json
@@ -5,11 +5,7 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-<<<<<<< HEAD
-    "build": "rm -rf dist && tsc && mkdir -p dist/knowledge dist/pre_built && cp src/knowledge/note_creation_*.md src/knowledge/welcome.md dist/knowledge/ && cp src/pre_built/*.md dist/pre_built/",
-=======
     "build": "rm -rf dist && tsc",
->>>>>>> 13c5c03f (fix note creation agent)
     "dev": "tsc -w"
   },
   "dependencies": {