diff --git a/package.json b/package.json
index 49dca3c..8e91bba 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
 	"name": "open-archiver",
-<<<<<<< HEAD
 	"version": "0.3.1",
-=======
-	"version": "0.3.0",
->>>>>>> main
 	"private": true,
 	"scripts": {
 		"dev": "dotenv -- pnpm --filter \"./packages/*\" --parallel dev",