diff --git a/packages/shared/package.json b/packages/shared/package.json
index 221925438..e976ec2b4 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,25 +1,4 @@
 {
-<<<<<<< HEAD
-    "name": "@panora/shared",
-    "main": "dist/entry.cjs.js",
-    "module": "dist/entry.esm.js",
-    "types": "dist/entry.d.ts",
-    "scripts": {
-        "build": "rimraf dist && rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript"
-    },
-    "version": "4.0.0",
-    "devDependencies": {
-        "@rollup/plugin-terser": "^0.4.4",
-        "@rollup/plugin-typescript": "^11.1.6",
-        "@types/node": "^20.11.17",
-        "@typescript-eslint/eslint-plugin": "^6.13.2",
-        "@typescript-eslint/parser": "^6.13.2",
-        "eslint": "^8.55.0",
-        "rimraf": "^5.0.5",
-        "rollup": "^4.14.1",
-        "rollup-plugin-dts": "^6.1.0",
-        "typescript": "^5.3.3"
-=======
   "name": "@panora/shared",
   "version": "4.0.0",
   "description": "NestJS npm package starter",
@@ -93,7 +72,6 @@
     "testRegex": ".spec.ts$",
     "transform": {
       "^.+\\.(t|j)s$": "ts-jest"
->>>>>>> 7026426bf8be8194ab9bcf0f3ad8d4210fe934d9
     },
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
diff --git a/packages/shared/rollup.config.ts b/packages/shared/rollup.config.ts
deleted file mode 100644
index 1809f3314..000000000
--- a/packages/shared/rollup.config.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import type { InputOptions, OutputOptions, RollupOptions } from 'rollup'
-
-import typescriptPlugin from '@rollup/plugin-typescript'
-import terserPlugin from '@rollup/plugin-terser'
-import dtsPlugin from 'rollup-plugin-dts'
-
-const outputPath = 'dist/entry'
-const commonInputOptions: InputOptions = {
-  input: 'src/index.ts',
-  plugins: [typescriptPlugin()]
-}
-const iifeCommonOutputOptions: OutputOptions = {
-  name: 'entry'
-}
-
-const config: RollupOptions[] = [
-  {
-    ...commonInputOptions,
-    output: [
-      {
-        file: `${outputPath}.esm.js`,
-        format: 'esm'
-      }
-    ]
-  },
-  {
-    ...commonInputOptions,
-    output: [
-      {
-        ...iifeCommonOutputOptions,
-        file: `${outputPath}.js`,
-        format: 'iife'
-      },
-      {
-        ...iifeCommonOutputOptions,
-        file: `${outputPath}.min.js`,
-        format: 'iife',
-        plugins: [terserPlugin()]
-      }
-    ]
-  },
-  {
-    ...commonInputOptions,
-    output: [
-      {
-        file: `${outputPath}.cjs.js`,
-        format: 'cjs'
-      }
-    ]
-  },
-  {
-    ...commonInputOptions,
-    plugins: [commonInputOptions.plugins, dtsPlugin()],
-    output: [
-      {
-        file: `${outputPath}.d.ts`,
-        format: 'esm'
-      }
-    ]
-  }
-]
-
-export default config
\ No newline at end of file