fix: ci issues

i18n/en.json

@@ -935,8 +935,8 @@
   "editor": "Editor",
   "editor_close_without_save_prompt": "The changes will not be saved",
   "editor_close_without_save_title": "Close editor?",
-  "editor_rotate_and_flip": "Rotate & Flip",
   "editor_reset_all_changes": "Reset all changes",
+  "editor_rotate_and_flip": "Rotate & Flip",
   "email": "Email",
   "email_notifications": "Email notifications",
   "empty_folder": "This folder is empty",

pnpm-lock.yaml

@@ -11008,10 +11008,6 @@ packages:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
 
-  tr46@5.1.1:
-    resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
-    engines: {node: '>=18'}
-
   transformation-matrix@3.1.0:
     resolution: {integrity: sha512-oYubRWTi2tYFHAL2J8DLvPIqIYcYZ0fSOi2vmSy042Ho4jBW2ce6VP7QfD44t65WQz6bw5w1Pk22J7lcUpaTKA==}
 
@@ -24171,16 +24167,8 @@ snapshots:
       punycode: 2.3.1
     optional: true
 
-<<<<<<< HEAD
-=======
-  tr46@5.1.1:
-    dependencies:
-      punycode: 2.3.1
-    optional: true
-
   transformation-matrix@3.1.0: {}
 
->>>>>>> 01fb71269 (feat: initial asset editing implementation)
   tree-dump@1.1.0(tslib@2.8.1):
     dependencies:
       tslib: 2.8.1