diff --git a/package.json b/package.json
index 4725c87d2..21422821e 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
 	"name": "misskey",
-<<<<<<< HEAD
-	"version": "12.108.1-nca10.net-v2",
-=======
-	"version": "12.110.0-nca10.net-v4",
->>>>>>> 12.110.0-nca10.net-v4
+	"version": "12.110.0-nca10.net-v5",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue
index 602b459ad..983dcb76f 100644
--- a/packages/client/src/pages/admin/emojigen.vue
+++ b/packages/client/src/pages/admin/emojigen.vue
@@ -109,7 +109,7 @@ export default defineComponent({
 			font: 'notosans-mono-bold',
 			emojiColor: '38BA91',
 			emojiUrl: '',
-			accentColors: ['#e36749', '#f29924', '#98c934', '#34c9a9', '#34a1c9', '#606df7', '#8d34c9', '#e84d83']
+			accentColors: ['#E7BA95', '#E7E7B0', '#B0E7CB', '#96E7E7', '#96CCE7', '#97B0E7', '#CECEFF', '#FF9D9D']
 		}
 	},