diff --git a/plugins/octopus-deploy/package.json b/plugins/octopus-deploy/package.json
index 1eee223008..3a699c9fc9 100644
--- a/plugins/octopus-deploy/package.json
+++ b/plugins/octopus-deploy/package.json
@@ -1,14 +1,8 @@
 {
   "name": "@backstage/plugin-octopus-deploy",
-<<<<<<< HEAD
   "version": "0.2.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
-=======
-  "version": "0.2.7",
-  "main": "dist/index.esm.js",
-  "types": "dist/index.d.ts",
->>>>>>> e7e3614866b7 (Added deep link to Octopus Deploy Project from release table for Octopus Deploy plugin)
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",