diff --git a/package.json b/package.json
index b8c7b14fb..363185dd3 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,7 @@
 {
-<<<<<<< HEAD
 	"name": "honisskey",
 	"author": "ThinaticSystem <git@thinaticsystem.com>",
-	"version": "12.90.0",
-=======
-	"name": "misskey",
-	"author": "syuilo <syuilotan@yahoo.co.jp>",
 	"version": "12.90.1",
->>>>>>> upstream/master
 	"codename": "indigo",
 	"repository": {
 		"type": "git",