diff --git a/msagent.js/package.json b/msagent.js/package.json
index 159806b..8d7317b 100644
--- a/msagent.js/package.json
+++ b/msagent.js/package.json
@@ -10,14 +10,8 @@
   "scripts": {
     "build": "parcel build"
   },
-<<<<<<< HEAD
   "type": "module",
   "source": "src/index.ts",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts"
-=======
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "type": "module"
->>>>>>> 2414658 (working chat and TTS)
 }