diff --git a/deno.json b/deno.json
index dfd667a..5ea5318 100644
--- a/deno.json
+++ b/deno.json
@@ -9,16 +9,11 @@
   "imports": {
     "@neabyte/deno-ansi": "jsr:@neabyte/deno-ansi@^0.1.0"
   },
-<<<<<<< HEAD
   "exports": {
     ".": "./src/mod.ts",
     "./types": "./src/types.ts"
   },
   "version": "1.6.0",
-=======
-  "exports": "./mod.ts",
-  "version": "1.5.1",
->>>>>>> 8073e044a7e840abdfc8c779abf2ac240b6dc4c1
   "name": "@proxnet/undead-logging",
   "license": "MIT"
 }