diff --git a/package.json b/package.json
index e58360f..b733da0 100644
--- a/package.json
+++ b/package.json
@@ -37,11 +37,7 @@
 		"@playform/pipe": "0.0.6"
 	},
 	"devDependencies": {
-<<<<<<< HEAD
-		"@playform/build": "0.1.0"
-=======
 		"@playform/build": "0.1.1"
->>>>>>> 72d8be1365af0d23e0941c5e276fc6ec7a025cbb
 	},
 	"publishConfig": {
 		"access": "public"