diff --git a/package-lock.json b/package-lock.json
index 9077780..1bd8ace 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-	"name": "hatsune",
+	"name": "hatsune_tst",
 	"version": "1.0.0",
 	"lockfileVersion": 1,
 	"requires": true,
@@ -38,9 +38,15 @@
 			}
 		},
 		"@famibee/skynovel": {
+<<<<<<< HEAD
 			"version": "1.0.0",
 			"resolved": "https://npm.pkg.github.com/download/@famibee/skynovel/1.0.0/8706d8664515f946f5ccc8a98751abf2a5b3166114a3bece1ba07529172600a4",
 			"integrity": "sha512-7d4qrwSyV+IjJAVfIKQxEx10pGckw/vQhVc464deFGX+oAOdO+sjhOBGRFlqysgY2vc3q76xkgo02BhoZbvcDg==",
+=======
+			"version": "0.22.0",
+			"resolved": "https://npm.pkg.github.com/download/@famibee/skynovel/0.22.0/3f942df8b65531f594e7119fd4708bb18b2adced5d25f5f1289f5bfe870a1a34",
+			"integrity": "sha512-v5S2vc0OZlPvQqKQWXK/hH8VaQvNrAmB45qQprFk0AHL8h5JVjOcNZbG9EuTWPQA5AEpT8o5+Mpv5amB4BV1Ng==",
+>>>>>>> db26db827927c8e7b999e69a922ff1a06edbc0d5
 			"requires": {
 				"@tweenjs/tween.js": "^18.5.0",
 				"devtools-detect": "^3.0.0",
diff --git a/package.json b/package.json
index 2eef023..4b3e0bc 100755
--- a/package.json
+++ b/package.json
@@ -8,7 +8,11 @@
 	"author": "ugainovel",
 	"license": "MIT",
 	"dependencies": {
+<<<<<<< HEAD
 		"@famibee/skynovel": "^1.0.0",
+=======
+		"@famibee/skynovel": "^0.22.0",
+>>>>>>> db26db827927c8e7b999e69a922ff1a06edbc0d5
 		"about-window": "^1.13.4",
 		"crypto-js": "^4.0.0",
 		"humane-js": "^3.2.2"