Change List

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "count": 131986,
    "next": "https://weblate.immersivetranslate.com/api/changes/?format=api&page=3",
    "previous": "https://weblate.immersivetranslate.com/api/changes/?format=api",
    "results": [
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/en/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:43.798261Z",
            "action": 0,
            "target": "",
            "id": 151122,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151122/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/24365/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/en/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:43.798201Z",
            "action": 59,
            "target": "The current version has the following limitations, which we are actively optimizing:\n<ol>\n<li>Some formula sections may overlap.</li>\n<li>Italicized text in translations will disappear.</li>\n<li>Small sections (such as author information, citations, table of contents entries, etc.) may not be accurately recognized.</li>\n<li>Only supports languages written in Latin, Chinese, Japanese, or Korean scripts as the source language.</li>\n<li>Does not support documents with Vietnamese as the source language.</li>\n<li>Does not support underlining.</li>\n<li>Does not support translation of chart areas.</li>\n<li>Does not support drop caps.</li>\n<li>Does not support PDF Outline translation.</li>\n<li>Does not support scanned, image-based, or OCR-based PDFs.</li>\n<li>Does not support ligatures.</li>\n<li>Does not support blueprints.</li>\n<li>Does not support Type3 fonts.</li>\n<li>Does not support image format inline formulas.</li>\n<li>Does not support right-to-left formatted documents.</li>\n<li>Only supports horizontally aligned text.</li>\n<li>Currently, selective ignoring of translation areas is not supported (the system will default to ignoring the translation of reference areas)</li></ol>",
            "id": 151121,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151121/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:43.461544Z",
            "action": 21,
            "target": "",
            "id": 151120,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151120/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:37.527571Z",
            "action": 53,
            "target": "",
            "id": 151119,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151119/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:24:52.030385Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151118,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151118/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:24:48.589795Z",
            "action": 21,
            "target": "",
            "id": 151117,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151117/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:24:42.399867Z",
            "action": 53,
            "target": "",
            "id": 151116,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151116/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:23:42.942152Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151115,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151115/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:23:39.286774Z",
            "action": 21,
            "target": "",
            "id": 151114,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151114/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:23:32.961591Z",
            "action": 53,
            "target": "",
            "id": 151113,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151113/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:52:53.074100Z",
            "action": 22,
            "target": "Auto-merging .gitignore\nCONFLICT (content): Merge conflict in .gitignore\nAuto-merging Makefile\nCONFLICT (content): Merge conflict in Makefile\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAuto-merging assets/constant.ts\nCONFLICT (add/add): Merge conflict in assets/constant.ts\nwarning: Cannot merge binary files: assets/dark-icon-badge.png (HEAD vs. main)\nAuto-merging assets/dark-icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon-badge.png\nwarning: Cannot merge binary files: assets/dark-icon.png (HEAD vs. main)\nAuto-merging assets/dark-icon.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon.png\nwarning: Cannot merge binary files: assets/icon-badge.png (HEAD vs. main)\nAuto-merging assets/icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/icon-badge.png\nwarning: Cannot merge binary files: assets/toolbar-icon.png (HEAD vs. main)\nAuto-merging assets/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in assets/toolbar-icon.png\nAuto-merging background.ts\nCONFLICT (content): Merge conflict in background.ts\nAuto-merging background/read_time.ts\nCONFLICT (add/add): Merge conflict in background/read_time.ts\nAuto-merging background/video_time.ts\nCONFLICT (add/add): Merge conflict in background/video_time.ts\nCONFLICT (modify/delete): background_command_listeners.ts deleted in HEAD and modified in main.  Version main of background_command_listeners.ts left in tree.\nCONFLICT (modify/delete): background_message_listeners.ts deleted in HEAD and modified in main.  Version main of background_message_listeners.ts left in tree.\nAuto-merging background_test.ts\nCONFLICT (content): Merge conflict in background_test.ts\nAuto-merging browser/background_fetch_stream.ts\nCONFLICT (add/add): Merge conflict in browser/background_fetch_stream.ts\nCONFLICT (modify/delete): browser/cache_manager.ts deleted in HEAD and modified in main.  Version main of browser/cache_manager.ts left in tree.\nAuto-merging browser/mock_browser.ts\nCONFLICT (content): Merge conflict in browser/mock_browser.ts\nAuto-merging browser/request.ts\nCONFLICT (content): Merge conflict in browser/request.ts\nAuto-merging browser/userscript_polyfill.ts\nCONFLICT (content): Merge conflict in browser/userscript_polyfill.ts\nCONFLICT (modify/delete): browser_deps.ts deleted in HEAD and modified in main.  Version main of browser_deps.ts left in tree.\nAuto-merging browser_proxy.ts\nCONFLICT (content): Merge conflict in browser_proxy.ts\nCONFLICT (modify/delete): browser_updated_listeners.ts deleted in HEAD and modified in main.  Version main of browser_updated_listeners.ts left in tree.\nCONFLICT (modify/delete): buildin_config.json deleted in HEAD and modified in main.  Version main of buildin_config.json left in tree.\nAuto-merging cli.ts\nCONFLICT (content): Merge conflict in cli.ts\nAuto-merging components/add_models_modal.tsx\nCONFLICT (add/add): Merge conflict in components/add_models_modal.tsx\nAuto-merging components/add_url_modal.tsx\nCONFLICT (content): Merge conflict in components/add_url_modal.tsx\nAuto-merging components/always_lang.tsx\nCONFLICT (content): Merge conflict in components/always_lang.tsx\nAuto-merging components/button_drop_down.tsx\nCONFLICT (content): Merge conflict in components/button_drop_down.tsx\nAuto-merging components/config_sync.tsx\nCONFLICT (content): Merge conflict in components/config_sync.tsx\nAuto-merging components/download_app.tsx\nCONFLICT (add/add): Merge conflict in components/download_app.tsx\nAuto-merging components/error_wrapper.tsx\nCONFLICT (add/add): Merge conflict in components/error_wrapper.tsx\nAuto-merging components/icons.tsx\nCONFLICT (add/add): Merge conflict in components/icons.tsx\nAuto-merging components/input_row.tsx\nCONFLICT (content): Merge conflict in components/input_row.tsx\nAuto-merging components/modal.tsx\nCONFLICT (add/add): Merge conflict in components/modal.tsx\nAuto-merging components/nav_left.tsx\nCONFLICT (content): Merge conflict in components/nav_left.tsx\nAuto-merging components/option_field.tsx\nCONFLICT (content): Merge conflict in components/option_field.tsx\nAuto-merging components/options_button.tsx\nCONFLICT (content): Merge conflict in components/options_button.tsx\nAuto-merging components/popup.tsx\nCONFLICT (content): Merge conflict in components/popup.tsx\nAuto-merging components/popup/always_translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/always_translate_language.tsx\nAuto-merging components/popup/footer.tsx\nCONFLICT (add/add): Merge conflict in components/popup/footer.tsx\nAuto-merging components/popup/for_this_site.tsx\nCONFLICT (add/add): Merge conflict in components/popup/for_this_site.tsx\nAuto-merging components/popup/mouse_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/mouse_translate.tsx\nAuto-merging components/popup/selection_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/selection_translate.tsx\nAuto-merging components/popup/services_icon.ts\nCONFLICT (add/add): Merge conflict in components/popup/services_icon.ts\nAuto-merging components/popup/translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translate_language.tsx\nAuto-merging components/popup/translation_service.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translation_service.tsx\nAuto-merging components/popup/trial_pro.tsx\nCONFLICT (add/add): Merge conflict in components/popup/trial_pro.tsx\nAuto-merging components/popup/widgets.tsx\nCONFLICT (add/add): Merge conflict in components/popup/widgets.tsx\nAuto-merging components/popup_generic.tsx\nCONFLICT (add/add): Merge conflict in components/popup_generic.tsx\nAuto-merging components/popup_types.ts\nCONFLICT (add/add): Merge conflict in components/popup_types.ts\nCONFLICT (modify/delete): components/select_drop_down.tsx deleted in HEAD and modified in main.  Version main of components/select_drop_down.tsx left in tree.\nAuto-merging components/select_link.tsx\nCONFLICT (content): Merge conflict in components/select_link.tsx\nAuto-merging components/service_select.tsx\nCONFLICT (add/add): Merge conflict in components/service_select.tsx\nAuto-merging components/shadow_components/error_result/error_result.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/error_result/error_result.tsx\nAuto-merging components/shadow_components/service_select/select_select.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/select_select.tsx\nAuto-merging components/shadow_components/service_select/style.ts\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/style.ts\nAuto-merging components/shortcut.tsx\nCONFLICT (add/add): Merge conflict in components/shortcut.tsx\nAuto-merging components/switch.tsx\nCONFLICT (content): Merge conflict in components/switch.tsx\nAuto-merging components/sync_latest.tsx\nCONFLICT (content): Merge conflict in components/sync_latest.tsx\nAuto-merging components/tags_input.tsx\nCONFLICT (add/add): Merge conflict in components/tags_input.tsx\nAuto-merging components/tooltip.tsx\nCONFLICT (add/add): Merge conflict in components/tooltip.tsx\nAuto-merging components/touch_mouse_helper.tsx\nCONFLICT (add/add): Merge conflict in components/touch_mouse_helper.tsx\nAuto-merging components/url_list.tsx\nCONFLICT (content): Merge conflict in components/url_list.tsx\nCONFLICT (modify/delete): config.ts deleted in HEAD and modified in main.  Version main of config.ts left in tree.\nAuto-merging constant.ts\nCONFLICT (content): Merge conflict in constant.ts\nCONFLICT (modify/delete): content_dom_listeners.ts deleted in HEAD and modified in main.  Version main of content_dom_listeners.ts left in tree.\nAuto-merging content_main.ts\nCONFLICT (content): Merge conflict in content_main.ts\nCONFLICT (modify/delete): content_message_listeners.ts deleted in HEAD and modified in main.  Version main of content_message_listeners.ts left in tree.\nAuto-merging content_script.ts\nAuto-merging content_start.ts\nCONFLICT (add/add): Merge conflict in content_start.ts\nAuto-merging cron.ts\nCONFLICT (content): Merge conflict in cron.ts\nAuto-merging default_config.json\nCONFLICT (add/add): Merge conflict in default_config.json\nAuto-merging deno.json\nCONFLICT (content): Merge conflict in deno.json\nAuto-merging deno.lock\nCONFLICT (add/add): Merge conflict in deno.lock\nCONFLICT (modify/delete): deps.ts deleted in HEAD and modified in main.  Version main of deps.ts left in tree.\nAuto-merging deps/dev_deps.ts\nCONFLICT (content): Merge conflict in deps/dev_deps.ts\nCONFLICT (modify/delete): docs/TODO.md deleted in HEAD and modified in main.  Version main of docs/TODO.md left in tree.\nCONFLICT (modify/delete): docs/config.md deleted in HEAD and modified in main.  Version main of docs/config.md left in tree.\nCONFLICT (modify/delete): docs/edge.md deleted in HEAD and modified in main.  Version main of docs/edge.md left in tree.\nAuto-merging docs/issues.md\nCONFLICT (content): Merge conflict in docs/issues.md\nCONFLICT (modify/delete): docs/sale.md deleted in HEAD and modified in main.  Version main of docs/sale.md left in tree.\nAuto-merging dom/apply_user_config_css.ts\nCONFLICT (content): Merge conflict in dom/apply_user_config_css.ts\nAuto-merging dom/context.ts\nCONFLICT (content): Merge conflict in dom/context.ts\nAuto-merging dom/inject_css_to_frame.ts\nCONFLICT (content): Merge conflict in dom/inject_css_to_frame.ts\nAuto-merging dom/main.ts\nCONFLICT (content): Merge conflict in dom/main.ts\nAuto-merging dom/paragraph_to_html.ts\nCONFLICT (content): Merge conflict in dom/paragraph_to_html.ts\nAuto-merging dom/util.ts\nCONFLICT (content): Merge conflict in dom/util.ts\nAuto-merging dom/util_test.ts\nCONFLICT (content): Merge conflict in dom/util_test.ts\nAuto-merging env.ts\nCONFLICT (content): Merge conflict in env.ts\nAuto-merging errors.ts\nCONFLICT (content): Merge conflict in errors.ts\nAuto-merging example/demo.tsx\nCONFLICT (content): Merge conflict in example/demo.tsx\nAuto-merging example/frame.html\nCONFLICT (content): Merge conflict in example/frame.html\nAuto-merging example/iframe.html\nCONFLICT (content): Merge conflict in example/iframe.html\nAuto-merging example/index.html\nCONFLICT (content): Merge conflict in example/index.html\nAuto-merging example/js-sdk.html\nCONFLICT (add/add): Merge conflict in example/js-sdk.html\nAuto-merging example/popup.html\nCONFLICT (add/add): Merge conflict in example/popup.html\nAuto-merging example/simple-p.html\nCONFLICT (add/add): Merge conflict in example/simple-p.html\nAuto-merging hooks/use_i18n.ts\nCONFLICT (content): Merge conflict in hooks/use_i18n.ts\nAuto-merging hooks/use_page_theme.ts\nCONFLICT (add/add): Merge conflict in hooks/use_page_theme.ts\nAuto-merging hooks/use_position_adjuster.ts\nCONFLICT (add/add): Merge conflict in hooks/use_position_adjuster.ts\nAuto-merging hooks/use_route.ts\nCONFLICT (content): Merge conflict in hooks/use_route.ts\nAuto-merging hooks/use_user_config.ts\nCONFLICT (content): Merge conflict in hooks/use_user_config.ts\nAuto-merging interface.ts\nCONFLICT (content): Merge conflict in interface.ts\nAuto-merging language/config.ts\nCONFLICT (add/add): Merge conflict in language/config.ts\nAuto-merging language/index.ts\nCONFLICT (add/add): Merge conflict in language/index.ts\nAuto-merging libs/preact-translation/translateProvider.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/translateProvider.tsx\nAuto-merging libs/preact-translation/useTranslate.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/useTranslate.tsx\nAuto-merging libs/preact-translation/utils.ts\nCONFLICT (content): Merge conflict in libs/preact-translation/utils.ts\nAuto-merging libs/protoframe/connector.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/connector.ts\nAuto-merging libs/protoframe/mod.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/mod.ts\nAuto-merging libs/retry.ts\nCONFLICT (add/add): Merge conflict in libs/retry.ts\nAuto-merging libs/subsrt-ts/subsrt_test.ts\nCONFLICT (add/add): Merge conflict in libs/subsrt-ts/subsrt_test.ts\nAuto-merging libs/use-chrome-storage/createChromeStorageStateHook.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/createChromeStorageStateHook.ts\nAuto-merging libs/use-chrome-storage/useChromeStorage.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/useChromeStorage.ts\nAuto-merging locales/aeb.json\nCONFLICT (add/add): Merge conflict in locales/aeb.json\nAuto-merging locales/ar.json\nCONFLICT (add/add): Merge conflict in locales/ar.json\nAuto-merging locales/ars.json\nCONFLICT (add/add): Merge conflict in locales/ars.json\nAuto-merging locales/arz.json\nCONFLICT (add/add): Merge conflict in locales/arz.json\nAuto-merging locales/de.json\nCONFLICT (add/add): Merge conflict in locales/de.json\nAuto-merging locales/en.json\nCONFLICT (content): Merge conflict in locales/en.json\nAuto-merging locales/es.json\nCONFLICT (add/add): Merge conflict in locales/es.json\nAuto-merging locales/fa.json\nCONFLICT (content): Merge conflict in locales/fa.json\nAuto-merging locales/fr.json\nCONFLICT (add/add): Merge conflict in locales/fr.json\nAuto-merging locales/he.json\nCONFLICT (add/add): Merge conflict in locales/he.json\nAuto-merging locales/hi.json\nCONFLICT (add/add): Merge conflict in locales/hi.json\nAuto-merging locales/hu.json\nCONFLICT (add/add): Merge conflict in locales/hu.json\nAuto-merging locales/id.json\nCONFLICT (add/add): Merge conflict in locales/id.json\nAuto-merging locales/it.json\nCONFLICT (add/add): Merge conflict in locales/it.json\nAuto-merging locales/ja.json\nCONFLICT (add/add): Merge conflict in locales/ja.json\nAuto-merging locales/ko.json\nCONFLICT (add/add): Merge conflict in locales/ko.json\nAuto-merging locales/mod.ts\nCONFLICT (add/add): Merge conflict in locales/mod.ts\nAuto-merging locales/my.json\nCONFLICT (add/add): Merge conflict in locales/my.json\nAuto-merging locales/pt-BR.json\nCONFLICT (add/add): Merge conflict in locales/pt-BR.json\nAuto-merging locales/pt-PT.json\nCONFLICT (add/add): Merge conflict in locales/pt-PT.json\nAuto-merging locales/ru.json\nCONFLICT (add/add): Merge conflict in locales/ru.json\nAuto-merging locales/tr.json\nCONFLICT (add/add): Merge conflict in locales/tr.json\nAuto-merging locales/uk.json\nCONFLICT (add/add): Merge conflict in locales/uk.json\nAuto-merging locales/vi.json\nCONFLICT (add/add): Merge conflict in locales/vi.json\nAuto-merging locales/zh-CN.json\nCONFLICT (content): Merge conflict in locales/zh-CN.json\nAuto-merging locales/zh-TW.json\nCONFLICT (content): Merge conflict in locales/zh-TW.json\nAuto-merging manifest.json\nCONFLICT (content): Merge conflict in manifest.json\nAuto-merging menu.ts\nCONFLICT (content): Merge conflict in menu.ts\nCONFLICT (modify/delete): messager.ts deleted in HEAD and modified in main.  Version main of messager.ts left in tree.\nAuto-merging offscreen.ts\nCONFLICT (add/add): Merge conflict in offscreen.ts\nCONFLICT (modify/delete): page_popup.tsx deleted in HEAD and modified in main.  Version main of page_popup.tsx left in tree.\nAuto-merging pages/about.tsx\nCONFLICT (content): Merge conflict in pages/about.tsx\nAuto-merging pages/advanced.tsx\nCONFLICT (content): Merge conflict in pages/advanced.tsx\nAuto-merging pages/ai_writing.tsx\nCONFLICT (add/add): Merge conflict in pages/ai_writing.tsx\nAuto-merging pages/assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/assistants.tsx\nAuto-merging pages/components/assistants_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/components/assistants_detail.tsx\nAuto-merging pages/components/custom_assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/components/custom_assistants.tsx\nAuto-merging pages/components/header.tsx\nCONFLICT (add/add): Merge conflict in pages/components/header.tsx\nAuto-merging pages/components/input_select.tsx\nCONFLICT (add/add): Merge conflict in pages/components/input_select.tsx\nAuto-merging pages/components/loading.tsx\nCONFLICT (add/add): Merge conflict in pages/components/loading.tsx\nAuto-merging pages/components/subtitle_style_preview.tsx\nCONFLICT (add/add): Merge conflict in pages/components/subtitle_style_preview.tsx\nAuto-merging pages/components/translation_service.tsx\nCONFLICT (add/add): Merge conflict in pages/components/translation_service.tsx\nAuto-merging pages/contact.tsx\nCONFLICT (add/add): Merge conflict in pages/contact.tsx\nAuto-merging pages/developer.tsx\nCONFLICT (content): Merge conflict in pages/developer.tsx\nAuto-merging pages/download_config.tsx\nCONFLICT (add/add): Merge conflict in pages/download_config.tsx\nAuto-merging pages/floating.tsx\nCONFLICT (add/add): Merge conflict in pages/floating.tsx\nAuto-merging pages/general.tsx\nCONFLICT (content): Merge conflict in pages/general.tsx\nAuto-merging pages/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/hooks.ts\nAuto-merging pages/import_export/helper.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/helper.ts\nAuto-merging pages/import_export/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/hooks.ts\nAuto-merging pages/import_export/index.tsx\nCONFLICT (add/add): Merge conflict in pages/import_export/index.tsx\nAuto-merging pages/input.tsx\nCONFLICT (add/add): Merge conflict in pages/input.tsx\nAuto-merging pages/manga.tsx\nCONFLICT (add/add): Merge conflict in pages/manga.tsx\nAuto-merging pages/mouse_hover.tsx\nCONFLICT (add/add): Merge conflict in pages/mouse_hover.tsx\nAuto-merging pages/options.tsx\nCONFLICT (content): Merge conflict in pages/options.tsx\nAuto-merging pages/popup.tsx\nCONFLICT (content): Merge conflict in pages/popup.tsx\nAuto-merging pages/selection_translation.tsx\nCONFLICT (add/add): Merge conflict in pages/selection_translation.tsx\nAuto-merging pages/services.tsx\nCONFLICT (add/add): Merge conflict in pages/services.tsx\nAuto-merging pages/shortcuts.tsx\nCONFLICT (add/add): Merge conflict in pages/shortcuts.tsx\nAuto-merging pages/side-panel/count-tag.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/count-tag.tsx\nAuto-merging pages/side-panel/dropdown.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/dropdown.tsx\nAuto-merging pages/side-panel/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/hooks.ts\nAuto-merging pages/side-panel/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/index.tsx\nAuto-merging pages/side-panel/reward-center/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/hooks.ts\nAuto-merging pages/side-panel/reward-center/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/index.tsx\nAuto-merging pages/side-panel/reward-center/mod.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/mod.ts\nAuto-merging pages/side-panel/select-language.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-language.tsx\nAuto-merging pages/side-panel/select-service.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-service.tsx\nAuto-merging pages/side-panel/translate-input.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/translate-input.tsx\nAuto-merging pages/subtitle.tsx\nCONFLICT (add/add): Merge conflict in pages/subtitle.tsx\nAuto-merging pages/terms/glossary_editor.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/glossary_editor.tsx\nAuto-merging pages/terms/helper.ts\nCONFLICT (add/add): Merge conflict in pages/terms/helper.ts\nAuto-merging pages/terms/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/terms/hooks.ts\nAuto-merging pages/terms/index.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/index.tsx\nAuto-merging pages/terms/terms_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/terms_detail.tsx\nAuto-merging pages/translation-services/consent_modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/consent_modal.tsx\nAuto-merging pages/translation-services/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/translation-services/hooks.ts\nAuto-merging pages/translation-services/modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/modal.tsx\nAuto-merging pages/translation-services/service-group.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-group.tsx\nAuto-merging pages/translation-services/service-item.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-item.tsx\nAuto-merging pages/translation-services/service-setting.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-setting.tsx\nAuto-merging pages/util.ts\nCONFLICT (add/add): Merge conflict in pages/util.ts\nAuto-merging pages/util_test.ts\nCONFLICT (add/add): Merge conflict in pages/util_test.ts\nAuto-merging pages/verify-service.ts\nCONFLICT (add/add): Merge conflict in pages/verify-service.ts\nAuto-merging popup.tsx\nCONFLICT (content): Merge conflict in popup.tsx\nAuto-merging scripts/check-i18n-params.ts\nCONFLICT (add/add): Merge conflict in scripts/check-i18n-params.ts\nAuto-merging scripts/deno.lock\nCONFLICT (add/add): Merge conflict in scripts/deno.lock\nAuto-merging scripts/generate_icon.ts\nCONFLICT (content): Merge conflict in scripts/generate_icon.ts\nAuto-merging scripts/generate_icon_badge.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_icon_badge.ts\nAuto-merging scripts/generate_translatedText.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_translatedText.ts\nAuto-merging scripts/quality/common.js\nCONFLICT (add/add): Merge conflict in scripts/quality/common.js\nAuto-merging scripts/quality/test_services.js\nCONFLICT (add/add): Merge conflict in scripts/quality/test_services.js\nAuto-merging scripts/remove_unused_keys.sh\nCONFLICT (add/add): Merge conflict in scripts/remove_unused_keys.sh\nAuto-merging scripts/update_locales.ts\nCONFLICT (add/add): Merge conflict in scripts/update_locales.ts\nAuto-merging serve.ts\nCONFLICT (content): Merge conflict in serve.ts\nAuto-merging services/access_token.ts\nCONFLICT (add/add): Merge conflict in services/access_token.ts\nAuto-merging services/ai.ts\nCONFLICT (add/add): Merge conflict in services/ai.ts\nAuto-merging services/ai_test.ts\nCONFLICT (add/add): Merge conflict in services/ai_test.ts\nAuto-merging services/bai.ts\nCONFLICT (content): Merge conflict in services/bai.ts\nAuto-merging services/baidu_qianfan.ts\nCONFLICT (add/add): Merge conflict in services/baidu_qianfan.ts\nAuto-merging services/bing/mod.ts\nCONFLICT (content): Merge conflict in services/bing/mod.ts\nCONFLICT (modify/delete): services/cache.ts deleted in HEAD and modified in main.  Version main of services/cache.ts left in tree.\nAuto-merging services/claude.ts\nCONFLICT (add/add): Merge conflict in services/claude.ts\nAuto-merging services/config.ts\nCONFLICT (add/add): Merge conflict in services/config.ts\nAuto-merging services/deepl.ts\nCONFLICT (content): Merge conflict in services/deepl.ts\nAuto-merging services/gemini.ts\nCONFLICT (add/add): Merge conflict in services/gemini.ts\nAuto-merging services/google.ts\nAuto-merging services/helper.ts\nCONFLICT (add/add): Merge conflict in services/helper.ts\nAuto-merging services/helper_test.ts\nCONFLICT (add/add): Merge conflict in services/helper_test.ts\nAuto-merging services/mock.ts\nCONFLICT (content): Merge conflict in services/mock.ts\nAuto-merging services/mod.ts\nCONFLICT (content): Merge conflict in services/mod.ts\nAuto-merging services/pro.ts\nCONFLICT (add/add): Merge conflict in services/pro.ts\nAuto-merging services/silicon_cloud.ts\nCONFLICT (add/add): Merge conflict in services/silicon_cloud.ts\nAuto-merging services/tencent_hunyuan.ts\nCONFLICT (add/add): Merge conflict in services/tencent_hunyuan.ts\nAuto-merging services/translation.ts\nCONFLICT (content): Merge conflict in services/translation.ts\nAuto-merging services/translation_test.ts\nCONFLICT (add/add): Merge conflict in services/translation_test.ts\nAuto-merging services/util.ts\nCONFLICT (content): Merge conflict in services/util.ts\nAuto-merging services/util_test.ts\nCONFLICT (content): Merge conflict in services/util_test.ts\nAuto-merging services/zhipu.ts\nCONFLICT (add/add): Merge conflict in services/zhipu.ts\nAuto-merging side-panel.tsx\nCONFLICT (add/add): Merge conflict in side-panel.tsx\nAuto-merging src/ai-assistant/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod.ts\nAuto-merging src/ai-assistant/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod_test.ts\nAuto-merging src/ai-writing/components/Insert-btn.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/Insert-btn.tsx\nAuto-merging src/ai-writing/components/ai-writing-button-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-button-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal.tsx\nAuto-merging src/ai-writing/components/chat.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/chat.tsx\nAuto-merging src/ai-writing/components/close-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/close-modal.tsx\nAuto-merging src/ai-writing/components/error.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/error.tsx\nAuto-merging src/ai-writing/components/language-select.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/language-select.tsx\nAuto-merging src/ai-writing/components/prompt-style.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/prompt-style.tsx\nAuto-merging src/ai-writing/components/suggestion.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/suggestion.tsx\nAuto-merging src/ai-writing/components/summary.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/summary.tsx\nAuto-merging src/ai-writing/components/translate-result.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/translate-result.tsx\nAuto-merging src/ai-writing/components/user-input-text.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input-text.tsx\nAuto-merging src/ai-writing/components/user-input.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input.tsx\nAuto-merging src/ai-writing/hooks/use-ai-writing-config.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-ai-writing-config.ts\nAuto-merging src/ai-writing/hooks/use-drag-modal.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-drag-modal.ts\nAuto-merging src/ai-writing/hooks/use-translate.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-translate.ts\nAuto-merging src/ai-writing/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/mod.ts\nAuto-merging src/ai-writing/prompts.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/prompts.ts\nAuto-merging src/ai-writing/styles.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/styles.ts\nAuto-merging src/ai-writing/types.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/types.ts\nAuto-merging src/auto_translate_referrer.ts\nCONFLICT (add/add): Merge conflict in src/auto_translate_referrer.ts\nAuto-merging src/body-filter.ts\nCONFLICT (add/add): Merge conflict in src/body-filter.ts\nAuto-merging src/browser-bridge/dom-event.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/dom-event.ts\nAuto-merging src/browser-bridge/inject.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/inject.ts\nAuto-merging src/browser-bridge/message.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/message.ts\nAuto-merging src/constant-urls.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls.ts\nAuto-merging src/constant-urls_test.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls_test.ts\nAuto-merging src/contexts/mod.ts\nCONFLICT (add/add): Merge conflict in src/contexts/mod.ts\nAuto-merging src/dialogs/ai-context-upgrade.tsx\nCONFLICT (add/add): Merge conflict in src/dialogs/ai-context-upgrade.tsx\nAuto-merging src/ebook-builder/mod.ts\nCONFLICT (add/add): Merge conflict in src/ebook-builder/mod.ts\nAuto-merging src/encode.ts\nCONFLICT (add/add): Merge conflict in src/encode.ts\nAuto-merging src/encode_test.ts\nCONFLICT (add/add): Merge conflict in src/encode_test.ts\nAuto-merging src/error/modal-ui.ts\nCONFLICT (add/add): Merge conflict in src/error/modal-ui.ts\nAuto-merging src/error/modal.ts\nCONFLICT (add/add): Merge conflict in src/error/modal.ts\nAuto-merging src/global_state.ts\nCONFLICT (add/add): Merge conflict in src/global_state.ts\nAuto-merging src/gpt/mod.ts\nCONFLICT (add/add): Merge conflict in src/gpt/mod.ts\nAuto-merging src/hotkey-hover/mod.ts\nCONFLICT (add/add): Merge conflict in src/hotkey-hover/mod.ts\nAuto-merging src/html-engine/core.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/core.ts\nAuto-merging src/html-engine/interface.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/interface.ts\nAuto-merging src/html-engine/mod.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/mod.ts\nAuto-merging src/html-engine/report.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/report.ts\nAuto-merging src/html-engine/rule.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/rule.ts\nAuto-merging src/html-engine/util.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/util.ts\nAuto-merging src/image/menu.ts\nCONFLICT (add/add): Merge conflict in src/image/menu.ts\nAuto-merging src/image/mod.ts\nCONFLICT (add/add): Merge conflict in src/image/mod.ts\nAuto-merging src/image/tools/hook.ts\nCONFLICT (add/add): Merge conflict in src/image/tools/hook.ts\nAuto-merging src/image/tools/index.tsx\nCONFLICT (add/add): Merge conflict in src/image/tools/index.tsx\nAuto-merging src/image/translate.ts\nCONFLICT (add/add): Merge conflict in src/image/translate.ts\nAuto-merging src/image/util.ts\nCONFLICT (add/add): Merge conflict in src/image/util.ts\nAuto-merging src/input/mod.ts\nCONFLICT (add/add): Merge conflict in src/input/mod.ts\nAuto-merging src/main.ts\nCONFLICT (add/add): Merge conflict in src/main.ts\nAuto-merging src/mock-side-panel/mod.tsx\nCONFLICT (add/add): Merge conflict in src/mock-side-panel/mod.tsx\nAuto-merging src/new-user-guide/components/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/arrow_animation.tsx\nAuto-merging src/new-user-guide/components/index.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/index.tsx\nAuto-merging src/new-user-guide/components/select-service-guide.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/select-service-guide.tsx\nAuto-merging src/new-user-guide/mod.ts\nCONFLICT (add/add): Merge conflict in src/new-user-guide/mod.ts\nAuto-merging src/notification/hook.ts\nCONFLICT (add/add): Merge conflict in src/notification/hook.ts\nAuto-merging src/notification/mod.tsx\nCONFLICT (add/add): Merge conflict in src/notification/mod.tsx\nAuto-merging src/notification/utils.ts\nCONFLICT (add/add): Merge conflict in src/notification/utils.ts\nAuto-merging src/pdf/util.ts\nCONFLICT (add/add): Merge conflict in src/pdf/util.ts\nAuto-merging src/resources/build-in-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.content.ts\nAuto-merging src/resources/build-in-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.ts\nAuto-merging src/resources/build-in-config.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.userscript.ts\nAuto-merging src/resources/final-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.content.ts\nAuto-merging src/resources/final-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.ts\nAuto-merging src/resources/locales.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.ts\nAuto-merging src/resources/locales.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.userscript.ts\nAuto-merging src/rich-translate.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate.ts\nAuto-merging src/rich-translate_test.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate_test.ts\nAuto-merging src/selection-translation/components/copy_text.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/copy_text.tsx\nAuto-merging src/selection-translation/components/dropdown.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/dropdown.tsx\nAuto-merging src/selection-translation/components/feedback.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/feedback.tsx\nAuto-merging src/selection-translation/components/inner_translator.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/inner_translator.tsx\nAuto-merging src/selection-translation/components/speaker.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/speaker.tsx\nAuto-merging src/selection-translation/components/styles.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/styles.tsx\nAuto-merging src/selection-translation/components/translation_modal.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/translation_modal.tsx\nAuto-merging src/selection-translation/components/trigger_icon.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/trigger_icon.tsx\nAuto-merging src/selection-translation/hooks/use-modal-position.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-modal-position.ts\nAuto-merging src/selection-translation/hooks/use-selection-service.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-selection-service.ts\nAuto-merging src/selection-translation/mod.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/mod.ts\nAuto-merging src/selection-translation/types.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/types.ts\nAuto-merging src/selection-translation/utils.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/utils.ts\nAuto-merging src/subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/subtitle/mod.ts\nAuto-merging src/translate-context/mod.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod.ts\nAuto-merging src/translate-context/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod_test.ts\nAuto-merging src/tts/index.ts\nCONFLICT (add/add): Merge conflict in src/tts/index.ts\nAuto-merging src/utils/chrome-util.ts\nCONFLICT (add/add): Merge conflict in src/utils/chrome-util.ts\nAuto-merging src/utils/crypto-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config.ts\nAuto-merging src/utils/crypto-config_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config_test.ts\nAuto-merging src/utils/hash.ts\nCONFLICT (add/add): Merge conflict in src/utils/hash.ts\nAuto-merging src/utils/secret-regex.ts\nCONFLICT (add/add): Merge conflict in src/utils/secret-regex.ts\nAuto-merging src/utils/translation_theme.ts\nCONFLICT (add/add): Merge conflict in src/utils/translation_theme.ts\nAuto-merging src/utils/user-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/user-config.ts\nAuto-merging src/utils/util.ts\nCONFLICT (add/add): Merge conflict in src/utils/util.ts\nAuto-merging src/utils/util_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/util_test.ts\nAuto-merging src/video-subtitle/attach-subtitle/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/hook.ts\nAuto-merging src/video-subtitle/attach-subtitle/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/index.tsx\nAuto-merging src/video-subtitle/deduplicate_subtitle_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/deduplicate_subtitle_test.ts\nAuto-merging src/video-subtitle/download_manager.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/download_manager.ts\nAuto-merging src/video-subtitle/inject.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/inject.ts\nAuto-merging src/video-subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/mod.ts\nAuto-merging src/video-subtitle/quick-button/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/hook.ts\nAuto-merging src/video-subtitle/quick-button/icon.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/icon.tsx\nAuto-merging src/video-subtitle/quick-button/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/index.tsx\nAuto-merging src/video-subtitle/translators/ai.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/ai.ts\nAuto-merging src/video-subtitle/translators/av.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/av.ts\nAuto-merging src/video-subtitle/translators/disneyplus.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/disneyplus.ts\nAuto-merging src/video-subtitle/translators/index.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/index.ts\nAuto-merging src/video-subtitle/translators/inject_util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/inject_util_test.ts\nAuto-merging src/video-subtitle/translators/khanacademy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/khanacademy.ts\nAuto-merging src/video-subtitle/translators/live.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/live.ts\nAuto-merging src/video-subtitle/translators/mubi.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/mubi.ts\nAuto-merging src/video-subtitle/translators/multi_attach_vtt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/multi_attach_vtt.ts\nAuto-merging src/video-subtitle/translators/subsrt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/subsrt.ts\nAuto-merging src/video-subtitle/translators/text_track.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track.ts\nAuto-merging src/video-subtitle/translators/text_track_dynamic.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track_dynamic.ts\nAuto-merging src/video-subtitle/translators/udemy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/udemy.ts\nAuto-merging src/video-subtitle/translators/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util.ts\nAuto-merging src/video-subtitle/translators/util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util_test.ts\nAuto-merging src/video-subtitle/translators/youtube.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/youtube.ts\nAuto-merging src/video-subtitle/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/util.ts\nAuto-merging src/video-subtitle/youtube/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/youtube/mod.ts\nAuto-merging src/walk_container.ts\nCONFLICT (add/add): Merge conflict in src/walk_container.ts\nAuto-merging src/yaml.ts\nCONFLICT (add/add): Merge conflict in src/yaml.ts\nAuto-merging src/yaml_test.ts\nCONFLICT (add/add): Merge conflict in src/yaml_test.ts\nwarning: Cannot merge binary files: static/badge-icons/128.png (HEAD vs. main)\nAuto-merging static/badge-icons/128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/128.png\nwarning: Cannot merge binary files: static/badge-icons/256.png (HEAD vs. main)\nAuto-merging static/badge-icons/256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/256.png\nwarning: Cannot merge binary files: static/badge-icons/32.png (HEAD vs. main)\nAuto-merging static/badge-icons/32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/32.png\nwarning: Cannot merge binary files: static/badge-icons/48.png (HEAD vs. main)\nAuto-merging static/badge-icons/48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/48.png\nwarning: Cannot merge binary files: static/badge-icons/64.png (HEAD vs. main)\nAuto-merging static/badge-icons/64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/64.png\nwarning: Cannot merge binary files: static/badge-icons/dark-128.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-128.png\nwarning: Cannot merge binary files: static/badge-icons/dark-256.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-256.png\nwarning: Cannot merge binary files: static/badge-icons/dark-32.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-32.png\nwarning: Cannot merge binary files: static/badge-icons/dark-48.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-48.png\nwarning: Cannot merge binary files: static/badge-icons/dark-64.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/dark-128.png (HEAD vs. main)\nAuto-merging static/icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-128.png\nwarning: Cannot merge binary files: static/icons/dark-256.png (HEAD vs. main)\nAuto-merging static/icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-256.png\nwarning: Cannot merge binary files: static/icons/dark-32.png (HEAD vs. main)\nAuto-merging static/icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-32.png\nwarning: Cannot merge binary files: static/icons/dark-48.png (HEAD vs. main)\nAuto-merging static/icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-48.png\nwarning: Cannot merge binary files: static/icons/dark-64.png (HEAD vs. main)\nAuto-merging static/icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/toolbar-icon.png (HEAD vs. main)\nAuto-merging static/icons/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in static/icons/toolbar-icon.png\nAuto-merging static/offscreen.html\nCONFLICT (add/add): Merge conflict in static/offscreen.html\nAuto-merging static/side-panel.html\nCONFLICT (add/add): Merge conflict in static/side-panel.html\nAuto-merging static/styles/inject.css\nCONFLICT (content): Merge conflict in static/styles/inject.css\nAuto-merging static/styles/input.css\nCONFLICT (add/add): Merge conflict in static/styles/input.css\nAuto-merging static/styles/options.css\nCONFLICT (content): Merge conflict in static/styles/options.css\nAuto-merging static/styles/popup.css\nCONFLICT (content): Merge conflict in static/styles/popup.css\nAuto-merging static/styles/side-panel.css\nCONFLICT (add/add): Merge conflict in static/styles/side-panel.css\nAuto-merging sync/google_auth.ts\nCONFLICT (content): Merge conflict in sync/google_auth.ts\nAuto-merging sync/util.ts\nCONFLICT (content): Merge conflict in sync/util.ts\nAuto-merging throttle_request_bus.ts\nCONFLICT (add/add): Merge conflict in throttle_request_bus.ts\nAuto-merging touch_shortcuts.ts\nCONFLICT (add/add): Merge conflict in touch_shortcuts.ts\nAuto-merging twind_config.ts\nCONFLICT (content): Merge conflict in twind_config.ts\nAuto-merging userscript.ts\nCONFLICT (content): Merge conflict in userscript.ts\nAuto-merging userscript/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in userscript/arrow_animation.tsx\nAuto-merging userscript/close_modal.tsx\nCONFLICT (add/add): Merge conflict in userscript/close_modal.tsx\nAuto-merging userscript/float_ball.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball.tsx\nAuto-merging userscript/float_ball_entry.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_entry.tsx\nAuto-merging userscript/float_ball_hook.ts\nCONFLICT (add/add): Merge conflict in userscript/float_ball_hook.ts\nAuto-merging userscript/float_ball_icon.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_icon.tsx\nAuto-merging userscript/guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/guide.tsx\nAuto-merging userscript/init_popup.tsx\nCONFLICT (add/add): Merge conflict in userscript/init_popup.tsx\nAuto-merging userscript/manga_guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/manga_guide.tsx\nwarning: Cannot merge binary files: userscript/options/favicon.ico (HEAD vs. main)\nAuto-merging userscript/options/favicon.ico\nCONFLICT (add/add): Merge conflict in userscript/options/favicon.ico\nAuto-merging userscript/options/index.html\nCONFLICT (content): Merge conflict in userscript/options/index.html\nAuto-merging userscript/options_entry.ts\nCONFLICT (content): Merge conflict in userscript/options_entry.ts\nAuto-merging userscript/popup_app.tsx\nCONFLICT (content): Merge conflict in userscript/popup_app.tsx\nAuto-merging userscript/sdk/lite-entry.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-entry.ts\nAuto-merging userscript/sdk/lite-helper.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-helper.ts\nAuto-merging userscript/sdk/lite-main.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-main.ts\nAuto-merging userscript/sdk/lite-view.tsx\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-view.tsx\nAuto-merging userscript/sheet.tsx\nCONFLICT (add/add): Merge conflict in userscript/sheet.tsx\nCONFLICT (modify/delete): userscript_command_listeners.ts deleted in HEAD and modified in main.  Version main of userscript_command_listeners.ts left in tree.\nCONFLICT (modify/delete): userscript_message.ts deleted in HEAD and modified in main.  Version main of userscript_message.ts left in tree.\nAuto-merging utils/aes_safe_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_safe_test.ts\nAuto-merging utils/aes_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_test.ts\nAuto-merging utils/app_version.ts\nCONFLICT (add/add): Merge conflict in utils/app_version.ts\nAuto-merging utils/app_version_test.ts\nCONFLICT (add/add): Merge conflict in utils/app_version_test.ts\nAuto-merging utils/append_tsx.tsx\nCONFLICT (add/add): Merge conflict in utils/append_tsx.tsx\nAuto-merging utils/browser_app.ts\nCONFLICT (add/add): Merge conflict in utils/browser_app.ts\nAuto-merging utils/compare_version.ts\nAuto-merging utils/date.ts\nCONFLICT (content): Merge conflict in utils/date.ts\nAuto-merging utils/date_test.ts\nCONFLICT (add/add): Merge conflict in utils/date_test.ts\nAuto-merging utils/discount_activity.ts\nCONFLICT (add/add): Merge conflict in utils/discount_activity.ts\nAuto-merging utils/expression.ts\nCONFLICT (add/add): Merge conflict in utils/expression.ts\nAuto-merging utils/expression_test.ts\nCONFLICT (add/add): Merge conflict in utils/expression_test.ts\nAuto-merging utils/fake_user.ts\nCONFLICT (add/add): Merge conflict in utils/fake_user.ts\nAuto-merging utils/format_language.ts\nCONFLICT (content): Merge conflict in utils/format_language.ts\nAuto-merging utils/iframe.ts\nCONFLICT (content): Merge conflict in utils/iframe.ts\nAuto-merging utils/is_pro.ts\nCONFLICT (add/add): Merge conflict in utils/is_pro.ts\nAuto-merging utils/is_valid_html_url.ts\nCONFLICT (content): Merge conflict in utils/is_valid_html_url.ts\nAuto-merging utils/js_sdk.ts\nCONFLICT (add/add): Merge conflict in utils/js_sdk.ts\nAuto-merging utils/language_detect_api.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_api.ts\nAuto-merging utils/language_detect_google.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_google.ts\nAuto-merging utils/mac_test.ts\nCONFLICT (add/add): Merge conflict in utils/mac_test.ts\nAuto-merging utils/merge_rule_test.ts\nCONFLICT (add/add): Merge conflict in utils/merge_rule_test.ts\nAuto-merging utils/page_view_report.ts\nCONFLICT (add/add): Merge conflict in utils/page_view_report.ts\nAuto-merging utils/platform.ts\nCONFLICT (content): Merge conflict in utils/platform.ts\nAuto-merging utils/pro_service_trial.ts\nCONFLICT (add/add): Merge conflict in utils/pro_service_trial.ts\nAuto-merging utils/rate_limiter.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter.ts\nAuto-merging utils/rate_limiter_test.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter_test.ts\nAuto-merging utils/split_text.ts\nCONFLICT (add/add): Merge conflict in utils/split_text.ts\nAuto-merging utils/split_text_test.ts\nCONFLICT (add/add): Merge conflict in utils/split_text_test.ts\nAuto-merging utils/subtitle_styles_items.ts\nCONFLICT (add/add): Merge conflict in utils/subtitle_styles_items.ts\nAuto-merging utils/update_models_test.ts\nCONFLICT (add/add): Merge conflict in utils/update_models_test.ts\nAuto-merging utils/url_match_test.ts\nCONFLICT (content): Merge conflict in utils/url_match_test.ts\nAuto-merging web-options/setup_web_options_page.ts\nCONFLICT (content): Merge conflict in web-options/setup_web_options_page.ts\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
            "id": 151112,
            "action_name": "Repository merge failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151112/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:52:44.769258Z",
            "action": 53,
            "target": "",
            "id": 151111,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151111/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:52:44.732999Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151110,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151110/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:52:41.271573Z",
            "action": 21,
            "target": "",
            "id": 151109,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151109/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:52:35.310490Z",
            "action": 53,
            "target": "",
            "id": 151108,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151108/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:19:16.954751Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151107,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151107/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:19:13.417805Z",
            "action": 21,
            "target": "",
            "id": 151106,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151106/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:19:07.420676Z",
            "action": 53,
            "target": "",
            "id": 151105,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151105/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:02:37.152775Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151104,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151104/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:02:33.496983Z",
            "action": 21,
            "target": "",
            "id": 151103,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151103/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T03:02:26.969025Z",
            "action": 53,
            "target": "",
            "id": 151102,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151102/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T02:50:55.416665Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151101,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151101/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T02:50:51.896848Z",
            "action": 21,
            "target": "",
            "id": 151100,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151100/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T02:50:45.635975Z",
            "action": 53,
            "target": "",
            "id": 151099,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151099/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T16:47:15.307367Z",
            "action": 22,
            "target": "Auto-merging .gitignore\nCONFLICT (content): Merge conflict in .gitignore\nAuto-merging Makefile\nCONFLICT (content): Merge conflict in Makefile\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAuto-merging assets/constant.ts\nCONFLICT (add/add): Merge conflict in assets/constant.ts\nwarning: Cannot merge binary files: assets/dark-icon-badge.png (HEAD vs. main)\nAuto-merging assets/dark-icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon-badge.png\nwarning: Cannot merge binary files: assets/dark-icon.png (HEAD vs. main)\nAuto-merging assets/dark-icon.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon.png\nwarning: Cannot merge binary files: assets/icon-badge.png (HEAD vs. main)\nAuto-merging assets/icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/icon-badge.png\nwarning: Cannot merge binary files: assets/toolbar-icon.png (HEAD vs. main)\nAuto-merging assets/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in assets/toolbar-icon.png\nAuto-merging background.ts\nCONFLICT (content): Merge conflict in background.ts\nAuto-merging background/read_time.ts\nCONFLICT (add/add): Merge conflict in background/read_time.ts\nAuto-merging background/video_time.ts\nCONFLICT (add/add): Merge conflict in background/video_time.ts\nCONFLICT (modify/delete): background_command_listeners.ts deleted in HEAD and modified in main.  Version main of background_command_listeners.ts left in tree.\nCONFLICT (modify/delete): background_message_listeners.ts deleted in HEAD and modified in main.  Version main of background_message_listeners.ts left in tree.\nAuto-merging background_test.ts\nCONFLICT (content): Merge conflict in background_test.ts\nAuto-merging browser/background_fetch_stream.ts\nCONFLICT (add/add): Merge conflict in browser/background_fetch_stream.ts\nCONFLICT (modify/delete): browser/cache_manager.ts deleted in HEAD and modified in main.  Version main of browser/cache_manager.ts left in tree.\nAuto-merging browser/mock_browser.ts\nCONFLICT (content): Merge conflict in browser/mock_browser.ts\nAuto-merging browser/request.ts\nCONFLICT (content): Merge conflict in browser/request.ts\nAuto-merging browser/userscript_polyfill.ts\nCONFLICT (content): Merge conflict in browser/userscript_polyfill.ts\nCONFLICT (modify/delete): browser_deps.ts deleted in HEAD and modified in main.  Version main of browser_deps.ts left in tree.\nAuto-merging browser_proxy.ts\nCONFLICT (content): Merge conflict in browser_proxy.ts\nCONFLICT (modify/delete): browser_updated_listeners.ts deleted in HEAD and modified in main.  Version main of browser_updated_listeners.ts left in tree.\nCONFLICT (modify/delete): buildin_config.json deleted in HEAD and modified in main.  Version main of buildin_config.json left in tree.\nAuto-merging cli.ts\nCONFLICT (content): Merge conflict in cli.ts\nAuto-merging components/add_models_modal.tsx\nCONFLICT (add/add): Merge conflict in components/add_models_modal.tsx\nAuto-merging components/add_url_modal.tsx\nCONFLICT (content): Merge conflict in components/add_url_modal.tsx\nAuto-merging components/always_lang.tsx\nCONFLICT (content): Merge conflict in components/always_lang.tsx\nAuto-merging components/button_drop_down.tsx\nCONFLICT (content): Merge conflict in components/button_drop_down.tsx\nAuto-merging components/config_sync.tsx\nCONFLICT (content): Merge conflict in components/config_sync.tsx\nAuto-merging components/download_app.tsx\nCONFLICT (add/add): Merge conflict in components/download_app.tsx\nAuto-merging components/error_wrapper.tsx\nCONFLICT (add/add): Merge conflict in components/error_wrapper.tsx\nAuto-merging components/icons.tsx\nCONFLICT (add/add): Merge conflict in components/icons.tsx\nAuto-merging components/input_row.tsx\nCONFLICT (content): Merge conflict in components/input_row.tsx\nAuto-merging components/modal.tsx\nCONFLICT (add/add): Merge conflict in components/modal.tsx\nAuto-merging components/nav_left.tsx\nCONFLICT (content): Merge conflict in components/nav_left.tsx\nAuto-merging components/option_field.tsx\nCONFLICT (content): Merge conflict in components/option_field.tsx\nAuto-merging components/options_button.tsx\nCONFLICT (content): Merge conflict in components/options_button.tsx\nAuto-merging components/popup.tsx\nCONFLICT (content): Merge conflict in components/popup.tsx\nAuto-merging components/popup/always_translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/always_translate_language.tsx\nAuto-merging components/popup/footer.tsx\nCONFLICT (add/add): Merge conflict in components/popup/footer.tsx\nAuto-merging components/popup/for_this_site.tsx\nCONFLICT (add/add): Merge conflict in components/popup/for_this_site.tsx\nAuto-merging components/popup/mouse_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/mouse_translate.tsx\nAuto-merging components/popup/selection_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/selection_translate.tsx\nAuto-merging components/popup/services_icon.ts\nCONFLICT (add/add): Merge conflict in components/popup/services_icon.ts\nAuto-merging components/popup/translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translate_language.tsx\nAuto-merging components/popup/translation_service.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translation_service.tsx\nAuto-merging components/popup/trial_pro.tsx\nCONFLICT (add/add): Merge conflict in components/popup/trial_pro.tsx\nAuto-merging components/popup/widgets.tsx\nCONFLICT (add/add): Merge conflict in components/popup/widgets.tsx\nAuto-merging components/popup_generic.tsx\nCONFLICT (add/add): Merge conflict in components/popup_generic.tsx\nAuto-merging components/popup_types.ts\nCONFLICT (add/add): Merge conflict in components/popup_types.ts\nCONFLICT (modify/delete): components/select_drop_down.tsx deleted in HEAD and modified in main.  Version main of components/select_drop_down.tsx left in tree.\nAuto-merging components/select_link.tsx\nCONFLICT (content): Merge conflict in components/select_link.tsx\nAuto-merging components/service_select.tsx\nCONFLICT (add/add): Merge conflict in components/service_select.tsx\nAuto-merging components/shadow_components/error_result/error_result.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/error_result/error_result.tsx\nAuto-merging components/shadow_components/service_select/select_select.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/select_select.tsx\nAuto-merging components/shadow_components/service_select/style.ts\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/style.ts\nAuto-merging components/shortcut.tsx\nCONFLICT (add/add): Merge conflict in components/shortcut.tsx\nAuto-merging components/switch.tsx\nCONFLICT (content): Merge conflict in components/switch.tsx\nAuto-merging components/sync_latest.tsx\nCONFLICT (content): Merge conflict in components/sync_latest.tsx\nAuto-merging components/tags_input.tsx\nCONFLICT (add/add): Merge conflict in components/tags_input.tsx\nAuto-merging components/tooltip.tsx\nCONFLICT (add/add): Merge conflict in components/tooltip.tsx\nAuto-merging components/touch_mouse_helper.tsx\nCONFLICT (add/add): Merge conflict in components/touch_mouse_helper.tsx\nAuto-merging components/url_list.tsx\nCONFLICT (content): Merge conflict in components/url_list.tsx\nCONFLICT (modify/delete): config.ts deleted in HEAD and modified in main.  Version main of config.ts left in tree.\nAuto-merging constant.ts\nCONFLICT (content): Merge conflict in constant.ts\nCONFLICT (modify/delete): content_dom_listeners.ts deleted in HEAD and modified in main.  Version main of content_dom_listeners.ts left in tree.\nAuto-merging content_main.ts\nCONFLICT (content): Merge conflict in content_main.ts\nCONFLICT (modify/delete): content_message_listeners.ts deleted in HEAD and modified in main.  Version main of content_message_listeners.ts left in tree.\nAuto-merging content_script.ts\nAuto-merging content_start.ts\nCONFLICT (add/add): Merge conflict in content_start.ts\nAuto-merging cron.ts\nCONFLICT (content): Merge conflict in cron.ts\nAuto-merging default_config.json\nCONFLICT (add/add): Merge conflict in default_config.json\nAuto-merging deno.json\nCONFLICT (content): Merge conflict in deno.json\nAuto-merging deno.lock\nCONFLICT (add/add): Merge conflict in deno.lock\nCONFLICT (modify/delete): deps.ts deleted in HEAD and modified in main.  Version main of deps.ts left in tree.\nAuto-merging deps/dev_deps.ts\nCONFLICT (content): Merge conflict in deps/dev_deps.ts\nCONFLICT (modify/delete): docs/TODO.md deleted in HEAD and modified in main.  Version main of docs/TODO.md left in tree.\nCONFLICT (modify/delete): docs/config.md deleted in HEAD and modified in main.  Version main of docs/config.md left in tree.\nCONFLICT (modify/delete): docs/edge.md deleted in HEAD and modified in main.  Version main of docs/edge.md left in tree.\nAuto-merging docs/issues.md\nCONFLICT (content): Merge conflict in docs/issues.md\nCONFLICT (modify/delete): docs/sale.md deleted in HEAD and modified in main.  Version main of docs/sale.md left in tree.\nAuto-merging dom/apply_user_config_css.ts\nCONFLICT (content): Merge conflict in dom/apply_user_config_css.ts\nAuto-merging dom/context.ts\nCONFLICT (content): Merge conflict in dom/context.ts\nAuto-merging dom/inject_css_to_frame.ts\nCONFLICT (content): Merge conflict in dom/inject_css_to_frame.ts\nAuto-merging dom/main.ts\nCONFLICT (content): Merge conflict in dom/main.ts\nAuto-merging dom/paragraph_to_html.ts\nCONFLICT (content): Merge conflict in dom/paragraph_to_html.ts\nAuto-merging dom/util.ts\nCONFLICT (content): Merge conflict in dom/util.ts\nAuto-merging dom/util_test.ts\nCONFLICT (content): Merge conflict in dom/util_test.ts\nAuto-merging env.ts\nCONFLICT (content): Merge conflict in env.ts\nAuto-merging errors.ts\nCONFLICT (content): Merge conflict in errors.ts\nAuto-merging example/demo.tsx\nCONFLICT (content): Merge conflict in example/demo.tsx\nAuto-merging example/frame.html\nCONFLICT (content): Merge conflict in example/frame.html\nAuto-merging example/iframe.html\nCONFLICT (content): Merge conflict in example/iframe.html\nAuto-merging example/index.html\nCONFLICT (content): Merge conflict in example/index.html\nAuto-merging example/js-sdk.html\nCONFLICT (add/add): Merge conflict in example/js-sdk.html\nAuto-merging example/popup.html\nCONFLICT (add/add): Merge conflict in example/popup.html\nAuto-merging example/simple-p.html\nCONFLICT (add/add): Merge conflict in example/simple-p.html\nAuto-merging hooks/use_i18n.ts\nCONFLICT (content): Merge conflict in hooks/use_i18n.ts\nAuto-merging hooks/use_page_theme.ts\nCONFLICT (add/add): Merge conflict in hooks/use_page_theme.ts\nAuto-merging hooks/use_position_adjuster.ts\nCONFLICT (add/add): Merge conflict in hooks/use_position_adjuster.ts\nAuto-merging hooks/use_route.ts\nCONFLICT (content): Merge conflict in hooks/use_route.ts\nAuto-merging hooks/use_user_config.ts\nCONFLICT (content): Merge conflict in hooks/use_user_config.ts\nAuto-merging interface.ts\nCONFLICT (content): Merge conflict in interface.ts\nAuto-merging language/config.ts\nCONFLICT (add/add): Merge conflict in language/config.ts\nAuto-merging language/index.ts\nCONFLICT (add/add): Merge conflict in language/index.ts\nAuto-merging libs/preact-translation/translateProvider.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/translateProvider.tsx\nAuto-merging libs/preact-translation/useTranslate.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/useTranslate.tsx\nAuto-merging libs/preact-translation/utils.ts\nCONFLICT (content): Merge conflict in libs/preact-translation/utils.ts\nAuto-merging libs/protoframe/connector.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/connector.ts\nAuto-merging libs/protoframe/mod.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/mod.ts\nAuto-merging libs/retry.ts\nCONFLICT (add/add): Merge conflict in libs/retry.ts\nAuto-merging libs/subsrt-ts/subsrt_test.ts\nCONFLICT (add/add): Merge conflict in libs/subsrt-ts/subsrt_test.ts\nAuto-merging libs/use-chrome-storage/createChromeStorageStateHook.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/createChromeStorageStateHook.ts\nAuto-merging libs/use-chrome-storage/useChromeStorage.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/useChromeStorage.ts\nAuto-merging locales/aeb.json\nCONFLICT (add/add): Merge conflict in locales/aeb.json\nAuto-merging locales/ar.json\nCONFLICT (add/add): Merge conflict in locales/ar.json\nAuto-merging locales/ars.json\nCONFLICT (add/add): Merge conflict in locales/ars.json\nAuto-merging locales/arz.json\nCONFLICT (add/add): Merge conflict in locales/arz.json\nAuto-merging locales/de.json\nCONFLICT (add/add): Merge conflict in locales/de.json\nAuto-merging locales/en.json\nCONFLICT (content): Merge conflict in locales/en.json\nAuto-merging locales/es.json\nCONFLICT (add/add): Merge conflict in locales/es.json\nAuto-merging locales/fa.json\nCONFLICT (content): Merge conflict in locales/fa.json\nAuto-merging locales/fr.json\nCONFLICT (add/add): Merge conflict in locales/fr.json\nAuto-merging locales/he.json\nCONFLICT (add/add): Merge conflict in locales/he.json\nAuto-merging locales/hi.json\nCONFLICT (add/add): Merge conflict in locales/hi.json\nAuto-merging locales/hu.json\nCONFLICT (add/add): Merge conflict in locales/hu.json\nAuto-merging locales/id.json\nCONFLICT (add/add): Merge conflict in locales/id.json\nAuto-merging locales/it.json\nCONFLICT (add/add): Merge conflict in locales/it.json\nAuto-merging locales/ja.json\nCONFLICT (add/add): Merge conflict in locales/ja.json\nAuto-merging locales/ko.json\nCONFLICT (add/add): Merge conflict in locales/ko.json\nAuto-merging locales/mod.ts\nCONFLICT (add/add): Merge conflict in locales/mod.ts\nAuto-merging locales/my.json\nCONFLICT (add/add): Merge conflict in locales/my.json\nAuto-merging locales/pt-BR.json\nCONFLICT (add/add): Merge conflict in locales/pt-BR.json\nAuto-merging locales/pt-PT.json\nCONFLICT (add/add): Merge conflict in locales/pt-PT.json\nAuto-merging locales/ru.json\nCONFLICT (add/add): Merge conflict in locales/ru.json\nAuto-merging locales/tr.json\nCONFLICT (add/add): Merge conflict in locales/tr.json\nAuto-merging locales/uk.json\nCONFLICT (add/add): Merge conflict in locales/uk.json\nAuto-merging locales/vi.json\nCONFLICT (add/add): Merge conflict in locales/vi.json\nAuto-merging locales/zh-CN.json\nCONFLICT (content): Merge conflict in locales/zh-CN.json\nAuto-merging locales/zh-TW.json\nCONFLICT (content): Merge conflict in locales/zh-TW.json\nAuto-merging manifest.json\nCONFLICT (content): Merge conflict in manifest.json\nAuto-merging menu.ts\nCONFLICT (content): Merge conflict in menu.ts\nCONFLICT (modify/delete): messager.ts deleted in HEAD and modified in main.  Version main of messager.ts left in tree.\nAuto-merging offscreen.ts\nCONFLICT (add/add): Merge conflict in offscreen.ts\nCONFLICT (modify/delete): page_popup.tsx deleted in HEAD and modified in main.  Version main of page_popup.tsx left in tree.\nAuto-merging pages/about.tsx\nCONFLICT (content): Merge conflict in pages/about.tsx\nAuto-merging pages/advanced.tsx\nCONFLICT (content): Merge conflict in pages/advanced.tsx\nAuto-merging pages/ai_writing.tsx\nCONFLICT (add/add): Merge conflict in pages/ai_writing.tsx\nAuto-merging pages/assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/assistants.tsx\nAuto-merging pages/components/assistants_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/components/assistants_detail.tsx\nAuto-merging pages/components/custom_assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/components/custom_assistants.tsx\nAuto-merging pages/components/header.tsx\nCONFLICT (add/add): Merge conflict in pages/components/header.tsx\nAuto-merging pages/components/input_select.tsx\nCONFLICT (add/add): Merge conflict in pages/components/input_select.tsx\nAuto-merging pages/components/loading.tsx\nCONFLICT (add/add): Merge conflict in pages/components/loading.tsx\nAuto-merging pages/components/subtitle_style_preview.tsx\nCONFLICT (add/add): Merge conflict in pages/components/subtitle_style_preview.tsx\nAuto-merging pages/components/translation_service.tsx\nCONFLICT (add/add): Merge conflict in pages/components/translation_service.tsx\nAuto-merging pages/contact.tsx\nCONFLICT (add/add): Merge conflict in pages/contact.tsx\nAuto-merging pages/developer.tsx\nCONFLICT (content): Merge conflict in pages/developer.tsx\nAuto-merging pages/download_config.tsx\nCONFLICT (add/add): Merge conflict in pages/download_config.tsx\nAuto-merging pages/floating.tsx\nCONFLICT (add/add): Merge conflict in pages/floating.tsx\nAuto-merging pages/general.tsx\nCONFLICT (content): Merge conflict in pages/general.tsx\nAuto-merging pages/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/hooks.ts\nAuto-merging pages/import_export/helper.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/helper.ts\nAuto-merging pages/import_export/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/hooks.ts\nAuto-merging pages/import_export/index.tsx\nCONFLICT (add/add): Merge conflict in pages/import_export/index.tsx\nAuto-merging pages/input.tsx\nCONFLICT (add/add): Merge conflict in pages/input.tsx\nAuto-merging pages/manga.tsx\nCONFLICT (add/add): Merge conflict in pages/manga.tsx\nAuto-merging pages/mouse_hover.tsx\nCONFLICT (add/add): Merge conflict in pages/mouse_hover.tsx\nAuto-merging pages/options.tsx\nCONFLICT (content): Merge conflict in pages/options.tsx\nAuto-merging pages/popup.tsx\nCONFLICT (content): Merge conflict in pages/popup.tsx\nAuto-merging pages/selection_translation.tsx\nCONFLICT (add/add): Merge conflict in pages/selection_translation.tsx\nAuto-merging pages/services.tsx\nCONFLICT (add/add): Merge conflict in pages/services.tsx\nAuto-merging pages/shortcuts.tsx\nCONFLICT (add/add): Merge conflict in pages/shortcuts.tsx\nAuto-merging pages/side-panel/count-tag.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/count-tag.tsx\nAuto-merging pages/side-panel/dropdown.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/dropdown.tsx\nAuto-merging pages/side-panel/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/hooks.ts\nAuto-merging pages/side-panel/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/index.tsx\nAuto-merging pages/side-panel/reward-center/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/hooks.ts\nAuto-merging pages/side-panel/reward-center/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/index.tsx\nAuto-merging pages/side-panel/reward-center/mod.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/mod.ts\nAuto-merging pages/side-panel/select-language.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-language.tsx\nAuto-merging pages/side-panel/select-service.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-service.tsx\nAuto-merging pages/side-panel/translate-input.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/translate-input.tsx\nAuto-merging pages/subtitle.tsx\nCONFLICT (add/add): Merge conflict in pages/subtitle.tsx\nAuto-merging pages/terms/glossary_editor.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/glossary_editor.tsx\nAuto-merging pages/terms/helper.ts\nCONFLICT (add/add): Merge conflict in pages/terms/helper.ts\nAuto-merging pages/terms/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/terms/hooks.ts\nAuto-merging pages/terms/index.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/index.tsx\nAuto-merging pages/terms/terms_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/terms_detail.tsx\nAuto-merging pages/translation-services/consent_modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/consent_modal.tsx\nAuto-merging pages/translation-services/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/translation-services/hooks.ts\nAuto-merging pages/translation-services/modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/modal.tsx\nAuto-merging pages/translation-services/service-group.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-group.tsx\nAuto-merging pages/translation-services/service-item.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-item.tsx\nAuto-merging pages/translation-services/service-setting.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-setting.tsx\nAuto-merging pages/util.ts\nCONFLICT (add/add): Merge conflict in pages/util.ts\nAuto-merging pages/util_test.ts\nCONFLICT (add/add): Merge conflict in pages/util_test.ts\nAuto-merging pages/verify-service.ts\nCONFLICT (add/add): Merge conflict in pages/verify-service.ts\nAuto-merging popup.tsx\nCONFLICT (content): Merge conflict in popup.tsx\nAuto-merging scripts/check-i18n-params.ts\nCONFLICT (add/add): Merge conflict in scripts/check-i18n-params.ts\nAuto-merging scripts/deno.lock\nCONFLICT (add/add): Merge conflict in scripts/deno.lock\nAuto-merging scripts/generate_icon.ts\nCONFLICT (content): Merge conflict in scripts/generate_icon.ts\nAuto-merging scripts/generate_icon_badge.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_icon_badge.ts\nAuto-merging scripts/generate_translatedText.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_translatedText.ts\nAuto-merging scripts/quality/common.js\nCONFLICT (add/add): Merge conflict in scripts/quality/common.js\nAuto-merging scripts/quality/test_services.js\nCONFLICT (add/add): Merge conflict in scripts/quality/test_services.js\nAuto-merging scripts/remove_unused_keys.sh\nCONFLICT (add/add): Merge conflict in scripts/remove_unused_keys.sh\nAuto-merging scripts/update_locales.ts\nCONFLICT (add/add): Merge conflict in scripts/update_locales.ts\nAuto-merging serve.ts\nCONFLICT (content): Merge conflict in serve.ts\nAuto-merging services/access_token.ts\nCONFLICT (add/add): Merge conflict in services/access_token.ts\nAuto-merging services/ai.ts\nCONFLICT (add/add): Merge conflict in services/ai.ts\nAuto-merging services/ai_test.ts\nCONFLICT (add/add): Merge conflict in services/ai_test.ts\nAuto-merging services/bai.ts\nCONFLICT (content): Merge conflict in services/bai.ts\nAuto-merging services/baidu_qianfan.ts\nCONFLICT (add/add): Merge conflict in services/baidu_qianfan.ts\nAuto-merging services/bing/mod.ts\nCONFLICT (content): Merge conflict in services/bing/mod.ts\nCONFLICT (modify/delete): services/cache.ts deleted in HEAD and modified in main.  Version main of services/cache.ts left in tree.\nAuto-merging services/claude.ts\nCONFLICT (add/add): Merge conflict in services/claude.ts\nAuto-merging services/config.ts\nCONFLICT (add/add): Merge conflict in services/config.ts\nAuto-merging services/deepl.ts\nCONFLICT (content): Merge conflict in services/deepl.ts\nAuto-merging services/gemini.ts\nCONFLICT (add/add): Merge conflict in services/gemini.ts\nAuto-merging services/google.ts\nAuto-merging services/helper.ts\nCONFLICT (add/add): Merge conflict in services/helper.ts\nAuto-merging services/helper_test.ts\nCONFLICT (add/add): Merge conflict in services/helper_test.ts\nAuto-merging services/mock.ts\nCONFLICT (content): Merge conflict in services/mock.ts\nAuto-merging services/mod.ts\nCONFLICT (content): Merge conflict in services/mod.ts\nAuto-merging services/pro.ts\nCONFLICT (add/add): Merge conflict in services/pro.ts\nAuto-merging services/silicon_cloud.ts\nCONFLICT (add/add): Merge conflict in services/silicon_cloud.ts\nAuto-merging services/tencent_hunyuan.ts\nCONFLICT (add/add): Merge conflict in services/tencent_hunyuan.ts\nAuto-merging services/translation.ts\nCONFLICT (content): Merge conflict in services/translation.ts\nAuto-merging services/translation_test.ts\nCONFLICT (add/add): Merge conflict in services/translation_test.ts\nAuto-merging services/util.ts\nCONFLICT (content): Merge conflict in services/util.ts\nAuto-merging services/util_test.ts\nCONFLICT (content): Merge conflict in services/util_test.ts\nAuto-merging services/zhipu.ts\nCONFLICT (add/add): Merge conflict in services/zhipu.ts\nAuto-merging side-panel.tsx\nCONFLICT (add/add): Merge conflict in side-panel.tsx\nAuto-merging src/ai-assistant/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod.ts\nAuto-merging src/ai-assistant/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod_test.ts\nAuto-merging src/ai-writing/components/Insert-btn.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/Insert-btn.tsx\nAuto-merging src/ai-writing/components/ai-writing-button-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-button-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal.tsx\nAuto-merging src/ai-writing/components/chat.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/chat.tsx\nAuto-merging src/ai-writing/components/close-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/close-modal.tsx\nAuto-merging src/ai-writing/components/error.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/error.tsx\nAuto-merging src/ai-writing/components/language-select.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/language-select.tsx\nAuto-merging src/ai-writing/components/prompt-style.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/prompt-style.tsx\nAuto-merging src/ai-writing/components/suggestion.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/suggestion.tsx\nAuto-merging src/ai-writing/components/summary.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/summary.tsx\nAuto-merging src/ai-writing/components/translate-result.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/translate-result.tsx\nAuto-merging src/ai-writing/components/user-input-text.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input-text.tsx\nAuto-merging src/ai-writing/components/user-input.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input.tsx\nAuto-merging src/ai-writing/hooks/use-ai-writing-config.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-ai-writing-config.ts\nAuto-merging src/ai-writing/hooks/use-drag-modal.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-drag-modal.ts\nAuto-merging src/ai-writing/hooks/use-translate.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-translate.ts\nAuto-merging src/ai-writing/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/mod.ts\nAuto-merging src/ai-writing/prompts.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/prompts.ts\nAuto-merging src/ai-writing/styles.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/styles.ts\nAuto-merging src/ai-writing/types.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/types.ts\nAuto-merging src/auto_translate_referrer.ts\nCONFLICT (add/add): Merge conflict in src/auto_translate_referrer.ts\nAuto-merging src/body-filter.ts\nCONFLICT (add/add): Merge conflict in src/body-filter.ts\nAuto-merging src/browser-bridge/dom-event.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/dom-event.ts\nAuto-merging src/browser-bridge/inject.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/inject.ts\nAuto-merging src/browser-bridge/message.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/message.ts\nAuto-merging src/constant-urls.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls.ts\nAuto-merging src/constant-urls_test.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls_test.ts\nAuto-merging src/contexts/mod.ts\nCONFLICT (add/add): Merge conflict in src/contexts/mod.ts\nAuto-merging src/dialogs/ai-context-upgrade.tsx\nCONFLICT (add/add): Merge conflict in src/dialogs/ai-context-upgrade.tsx\nAuto-merging src/ebook-builder/mod.ts\nCONFLICT (add/add): Merge conflict in src/ebook-builder/mod.ts\nAuto-merging src/encode.ts\nCONFLICT (add/add): Merge conflict in src/encode.ts\nAuto-merging src/encode_test.ts\nCONFLICT (add/add): Merge conflict in src/encode_test.ts\nAuto-merging src/error/modal-ui.ts\nCONFLICT (add/add): Merge conflict in src/error/modal-ui.ts\nAuto-merging src/error/modal.ts\nCONFLICT (add/add): Merge conflict in src/error/modal.ts\nAuto-merging src/global_state.ts\nCONFLICT (add/add): Merge conflict in src/global_state.ts\nAuto-merging src/gpt/mod.ts\nCONFLICT (add/add): Merge conflict in src/gpt/mod.ts\nAuto-merging src/hotkey-hover/mod.ts\nCONFLICT (add/add): Merge conflict in src/hotkey-hover/mod.ts\nAuto-merging src/html-engine/core.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/core.ts\nAuto-merging src/html-engine/interface.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/interface.ts\nAuto-merging src/html-engine/mod.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/mod.ts\nAuto-merging src/html-engine/report.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/report.ts\nAuto-merging src/html-engine/rule.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/rule.ts\nAuto-merging src/html-engine/util.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/util.ts\nAuto-merging src/image/menu.ts\nCONFLICT (add/add): Merge conflict in src/image/menu.ts\nAuto-merging src/image/mod.ts\nCONFLICT (add/add): Merge conflict in src/image/mod.ts\nAuto-merging src/image/tools/hook.ts\nCONFLICT (add/add): Merge conflict in src/image/tools/hook.ts\nAuto-merging src/image/tools/index.tsx\nCONFLICT (add/add): Merge conflict in src/image/tools/index.tsx\nAuto-merging src/image/translate.ts\nCONFLICT (add/add): Merge conflict in src/image/translate.ts\nAuto-merging src/image/util.ts\nCONFLICT (add/add): Merge conflict in src/image/util.ts\nAuto-merging src/input/mod.ts\nCONFLICT (add/add): Merge conflict in src/input/mod.ts\nAuto-merging src/main.ts\nCONFLICT (add/add): Merge conflict in src/main.ts\nAuto-merging src/mock-side-panel/mod.tsx\nCONFLICT (add/add): Merge conflict in src/mock-side-panel/mod.tsx\nAuto-merging src/new-user-guide/components/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/arrow_animation.tsx\nAuto-merging src/new-user-guide/components/index.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/index.tsx\nAuto-merging src/new-user-guide/components/select-service-guide.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/select-service-guide.tsx\nAuto-merging src/new-user-guide/mod.ts\nCONFLICT (add/add): Merge conflict in src/new-user-guide/mod.ts\nAuto-merging src/notification/hook.ts\nCONFLICT (add/add): Merge conflict in src/notification/hook.ts\nAuto-merging src/notification/mod.tsx\nCONFLICT (add/add): Merge conflict in src/notification/mod.tsx\nAuto-merging src/notification/utils.ts\nCONFLICT (add/add): Merge conflict in src/notification/utils.ts\nAuto-merging src/pdf/util.ts\nCONFLICT (add/add): Merge conflict in src/pdf/util.ts\nAuto-merging src/resources/build-in-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.content.ts\nAuto-merging src/resources/build-in-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.ts\nAuto-merging src/resources/build-in-config.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.userscript.ts\nAuto-merging src/resources/final-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.content.ts\nAuto-merging src/resources/final-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.ts\nAuto-merging src/resources/locales.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.ts\nAuto-merging src/resources/locales.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.userscript.ts\nAuto-merging src/rich-translate.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate.ts\nAuto-merging src/rich-translate_test.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate_test.ts\nAuto-merging src/selection-translation/components/copy_text.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/copy_text.tsx\nAuto-merging src/selection-translation/components/dropdown.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/dropdown.tsx\nAuto-merging src/selection-translation/components/feedback.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/feedback.tsx\nAuto-merging src/selection-translation/components/inner_translator.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/inner_translator.tsx\nAuto-merging src/selection-translation/components/speaker.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/speaker.tsx\nAuto-merging src/selection-translation/components/styles.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/styles.tsx\nAuto-merging src/selection-translation/components/translation_modal.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/translation_modal.tsx\nAuto-merging src/selection-translation/components/trigger_icon.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/trigger_icon.tsx\nAuto-merging src/selection-translation/hooks/use-modal-position.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-modal-position.ts\nAuto-merging src/selection-translation/hooks/use-selection-service.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-selection-service.ts\nAuto-merging src/selection-translation/mod.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/mod.ts\nAuto-merging src/selection-translation/types.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/types.ts\nAuto-merging src/selection-translation/utils.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/utils.ts\nAuto-merging src/subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/subtitle/mod.ts\nAuto-merging src/translate-context/mod.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod.ts\nAuto-merging src/translate-context/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod_test.ts\nAuto-merging src/tts/index.ts\nCONFLICT (add/add): Merge conflict in src/tts/index.ts\nAuto-merging src/utils/chrome-util.ts\nCONFLICT (add/add): Merge conflict in src/utils/chrome-util.ts\nAuto-merging src/utils/crypto-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config.ts\nAuto-merging src/utils/crypto-config_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config_test.ts\nAuto-merging src/utils/hash.ts\nCONFLICT (add/add): Merge conflict in src/utils/hash.ts\nAuto-merging src/utils/secret-regex.ts\nCONFLICT (add/add): Merge conflict in src/utils/secret-regex.ts\nAuto-merging src/utils/translation_theme.ts\nCONFLICT (add/add): Merge conflict in src/utils/translation_theme.ts\nAuto-merging src/utils/user-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/user-config.ts\nAuto-merging src/utils/util.ts\nCONFLICT (add/add): Merge conflict in src/utils/util.ts\nAuto-merging src/utils/util_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/util_test.ts\nAuto-merging src/video-subtitle/attach-subtitle/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/hook.ts\nAuto-merging src/video-subtitle/attach-subtitle/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/index.tsx\nAuto-merging src/video-subtitle/deduplicate_subtitle_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/deduplicate_subtitle_test.ts\nAuto-merging src/video-subtitle/download_manager.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/download_manager.ts\nAuto-merging src/video-subtitle/inject.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/inject.ts\nAuto-merging src/video-subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/mod.ts\nAuto-merging src/video-subtitle/quick-button/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/hook.ts\nAuto-merging src/video-subtitle/quick-button/icon.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/icon.tsx\nAuto-merging src/video-subtitle/quick-button/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/index.tsx\nAuto-merging src/video-subtitle/translators/ai.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/ai.ts\nAuto-merging src/video-subtitle/translators/av.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/av.ts\nAuto-merging src/video-subtitle/translators/disneyplus.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/disneyplus.ts\nAuto-merging src/video-subtitle/translators/index.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/index.ts\nAuto-merging src/video-subtitle/translators/inject_util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/inject_util_test.ts\nAuto-merging src/video-subtitle/translators/khanacademy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/khanacademy.ts\nAuto-merging src/video-subtitle/translators/live.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/live.ts\nAuto-merging src/video-subtitle/translators/mubi.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/mubi.ts\nAuto-merging src/video-subtitle/translators/multi_attach_vtt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/multi_attach_vtt.ts\nAuto-merging src/video-subtitle/translators/subsrt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/subsrt.ts\nAuto-merging src/video-subtitle/translators/text_track.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track.ts\nAuto-merging src/video-subtitle/translators/text_track_dynamic.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track_dynamic.ts\nAuto-merging src/video-subtitle/translators/udemy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/udemy.ts\nAuto-merging src/video-subtitle/translators/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util.ts\nAuto-merging src/video-subtitle/translators/util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util_test.ts\nAuto-merging src/video-subtitle/translators/youtube.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/youtube.ts\nAuto-merging src/video-subtitle/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/util.ts\nAuto-merging src/video-subtitle/youtube/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/youtube/mod.ts\nAuto-merging src/walk_container.ts\nCONFLICT (add/add): Merge conflict in src/walk_container.ts\nAuto-merging src/yaml.ts\nCONFLICT (add/add): Merge conflict in src/yaml.ts\nAuto-merging src/yaml_test.ts\nCONFLICT (add/add): Merge conflict in src/yaml_test.ts\nwarning: Cannot merge binary files: static/badge-icons/128.png (HEAD vs. main)\nAuto-merging static/badge-icons/128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/128.png\nwarning: Cannot merge binary files: static/badge-icons/256.png (HEAD vs. main)\nAuto-merging static/badge-icons/256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/256.png\nwarning: Cannot merge binary files: static/badge-icons/32.png (HEAD vs. main)\nAuto-merging static/badge-icons/32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/32.png\nwarning: Cannot merge binary files: static/badge-icons/48.png (HEAD vs. main)\nAuto-merging static/badge-icons/48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/48.png\nwarning: Cannot merge binary files: static/badge-icons/64.png (HEAD vs. main)\nAuto-merging static/badge-icons/64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/64.png\nwarning: Cannot merge binary files: static/badge-icons/dark-128.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-128.png\nwarning: Cannot merge binary files: static/badge-icons/dark-256.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-256.png\nwarning: Cannot merge binary files: static/badge-icons/dark-32.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-32.png\nwarning: Cannot merge binary files: static/badge-icons/dark-48.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-48.png\nwarning: Cannot merge binary files: static/badge-icons/dark-64.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/dark-128.png (HEAD vs. main)\nAuto-merging static/icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-128.png\nwarning: Cannot merge binary files: static/icons/dark-256.png (HEAD vs. main)\nAuto-merging static/icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-256.png\nwarning: Cannot merge binary files: static/icons/dark-32.png (HEAD vs. main)\nAuto-merging static/icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-32.png\nwarning: Cannot merge binary files: static/icons/dark-48.png (HEAD vs. main)\nAuto-merging static/icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-48.png\nwarning: Cannot merge binary files: static/icons/dark-64.png (HEAD vs. main)\nAuto-merging static/icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/toolbar-icon.png (HEAD vs. main)\nAuto-merging static/icons/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in static/icons/toolbar-icon.png\nAuto-merging static/offscreen.html\nCONFLICT (add/add): Merge conflict in static/offscreen.html\nAuto-merging static/side-panel.html\nCONFLICT (add/add): Merge conflict in static/side-panel.html\nAuto-merging static/styles/inject.css\nCONFLICT (content): Merge conflict in static/styles/inject.css\nAuto-merging static/styles/input.css\nCONFLICT (add/add): Merge conflict in static/styles/input.css\nAuto-merging static/styles/options.css\nCONFLICT (content): Merge conflict in static/styles/options.css\nAuto-merging static/styles/popup.css\nCONFLICT (content): Merge conflict in static/styles/popup.css\nAuto-merging static/styles/side-panel.css\nCONFLICT (add/add): Merge conflict in static/styles/side-panel.css\nAuto-merging sync/google_auth.ts\nCONFLICT (content): Merge conflict in sync/google_auth.ts\nAuto-merging sync/util.ts\nCONFLICT (content): Merge conflict in sync/util.ts\nAuto-merging throttle_request_bus.ts\nCONFLICT (add/add): Merge conflict in throttle_request_bus.ts\nAuto-merging touch_shortcuts.ts\nCONFLICT (add/add): Merge conflict in touch_shortcuts.ts\nAuto-merging twind_config.ts\nCONFLICT (content): Merge conflict in twind_config.ts\nAuto-merging userscript.ts\nCONFLICT (content): Merge conflict in userscript.ts\nAuto-merging userscript/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in userscript/arrow_animation.tsx\nAuto-merging userscript/close_modal.tsx\nCONFLICT (add/add): Merge conflict in userscript/close_modal.tsx\nAuto-merging userscript/float_ball.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball.tsx\nAuto-merging userscript/float_ball_entry.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_entry.tsx\nAuto-merging userscript/float_ball_hook.ts\nCONFLICT (add/add): Merge conflict in userscript/float_ball_hook.ts\nAuto-merging userscript/float_ball_icon.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_icon.tsx\nAuto-merging userscript/guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/guide.tsx\nAuto-merging userscript/init_popup.tsx\nCONFLICT (add/add): Merge conflict in userscript/init_popup.tsx\nAuto-merging userscript/manga_guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/manga_guide.tsx\nwarning: Cannot merge binary files: userscript/options/favicon.ico (HEAD vs. main)\nAuto-merging userscript/options/favicon.ico\nCONFLICT (add/add): Merge conflict in userscript/options/favicon.ico\nAuto-merging userscript/options/index.html\nCONFLICT (content): Merge conflict in userscript/options/index.html\nAuto-merging userscript/options_entry.ts\nCONFLICT (content): Merge conflict in userscript/options_entry.ts\nAuto-merging userscript/popup_app.tsx\nCONFLICT (content): Merge conflict in userscript/popup_app.tsx\nAuto-merging userscript/sdk/lite-entry.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-entry.ts\nAuto-merging userscript/sdk/lite-helper.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-helper.ts\nAuto-merging userscript/sdk/lite-main.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-main.ts\nAuto-merging userscript/sdk/lite-view.tsx\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-view.tsx\nAuto-merging userscript/sheet.tsx\nCONFLICT (add/add): Merge conflict in userscript/sheet.tsx\nCONFLICT (modify/delete): userscript_command_listeners.ts deleted in HEAD and modified in main.  Version main of userscript_command_listeners.ts left in tree.\nCONFLICT (modify/delete): userscript_message.ts deleted in HEAD and modified in main.  Version main of userscript_message.ts left in tree.\nAuto-merging utils/aes_safe_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_safe_test.ts\nAuto-merging utils/aes_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_test.ts\nAuto-merging utils/app_version.ts\nCONFLICT (add/add): Merge conflict in utils/app_version.ts\nAuto-merging utils/app_version_test.ts\nCONFLICT (add/add): Merge conflict in utils/app_version_test.ts\nAuto-merging utils/append_tsx.tsx\nCONFLICT (add/add): Merge conflict in utils/append_tsx.tsx\nAuto-merging utils/browser_app.ts\nCONFLICT (add/add): Merge conflict in utils/browser_app.ts\nAuto-merging utils/compare_version.ts\nAuto-merging utils/date.ts\nCONFLICT (content): Merge conflict in utils/date.ts\nAuto-merging utils/date_test.ts\nCONFLICT (add/add): Merge conflict in utils/date_test.ts\nAuto-merging utils/discount_activity.ts\nCONFLICT (add/add): Merge conflict in utils/discount_activity.ts\nAuto-merging utils/expression.ts\nCONFLICT (add/add): Merge conflict in utils/expression.ts\nAuto-merging utils/expression_test.ts\nCONFLICT (add/add): Merge conflict in utils/expression_test.ts\nAuto-merging utils/fake_user.ts\nCONFLICT (add/add): Merge conflict in utils/fake_user.ts\nAuto-merging utils/format_language.ts\nCONFLICT (content): Merge conflict in utils/format_language.ts\nAuto-merging utils/iframe.ts\nCONFLICT (content): Merge conflict in utils/iframe.ts\nAuto-merging utils/is_pro.ts\nCONFLICT (add/add): Merge conflict in utils/is_pro.ts\nAuto-merging utils/is_valid_html_url.ts\nCONFLICT (content): Merge conflict in utils/is_valid_html_url.ts\nAuto-merging utils/js_sdk.ts\nCONFLICT (add/add): Merge conflict in utils/js_sdk.ts\nAuto-merging utils/language_detect_api.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_api.ts\nAuto-merging utils/language_detect_google.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_google.ts\nAuto-merging utils/mac_test.ts\nCONFLICT (add/add): Merge conflict in utils/mac_test.ts\nAuto-merging utils/merge_rule_test.ts\nCONFLICT (add/add): Merge conflict in utils/merge_rule_test.ts\nAuto-merging utils/page_view_report.ts\nCONFLICT (add/add): Merge conflict in utils/page_view_report.ts\nAuto-merging utils/platform.ts\nCONFLICT (content): Merge conflict in utils/platform.ts\nAuto-merging utils/pro_service_trial.ts\nCONFLICT (add/add): Merge conflict in utils/pro_service_trial.ts\nAuto-merging utils/rate_limiter.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter.ts\nAuto-merging utils/rate_limiter_test.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter_test.ts\nAuto-merging utils/split_text.ts\nCONFLICT (add/add): Merge conflict in utils/split_text.ts\nAuto-merging utils/split_text_test.ts\nCONFLICT (add/add): Merge conflict in utils/split_text_test.ts\nAuto-merging utils/subtitle_styles_items.ts\nCONFLICT (add/add): Merge conflict in utils/subtitle_styles_items.ts\nAuto-merging utils/update_models_test.ts\nCONFLICT (add/add): Merge conflict in utils/update_models_test.ts\nAuto-merging utils/url_match_test.ts\nCONFLICT (content): Merge conflict in utils/url_match_test.ts\nAuto-merging web-options/setup_web_options_page.ts\nCONFLICT (content): Merge conflict in web-options/setup_web_options_page.ts\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
            "id": 151098,
            "action_name": "Repository merge failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151098/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T16:47:06.222311Z",
            "action": 53,
            "target": "",
            "id": 151097,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151097/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:55:53.011479Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151096,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151096/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:55:49.448867Z",
            "action": 21,
            "target": "",
            "id": 151095,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151095/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:55:43.190462Z",
            "action": 53,
            "target": "",
            "id": 151094,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151094/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:12.417535Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151093,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151093/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.151151Z",
            "action": 0,
            "target": "",
            "id": 151092,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151092/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91696/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.151084Z",
            "action": 71,
            "target": "關閉",
            "id": 151091,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151091/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91695/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.151016Z",
            "action": 71,
            "target": "暫無可下載文件",
            "id": 151090,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151090/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91694/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150946Z",
            "action": 71,
            "target": "下載",
            "id": 151089,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151089/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91693/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150862Z",
            "action": 71,
            "target": "正在獲取可下載文件...",
            "id": 151088,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151088/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91692/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150793Z",
            "action": 71,
            "target": "下載文件",
            "id": 151087,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151087/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91691/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150723Z",
            "action": 71,
            "target": "翻譯ID：",
            "id": 151086,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151086/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91690/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150655Z",
            "action": 71,
            "target": "編碼：",
            "id": 151085,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151085/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91689/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150585Z",
            "action": 71,
            "target": "請在郵件中附上編碼與翻譯ID以便排查",
            "id": 151084,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151084/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91688/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150517Z",
            "action": 71,
            "target": "請附上編碼與翻譯ID以便排查",
            "id": 151083,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151083/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91687/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150438Z",
            "action": 71,
            "target": "請將下方「編碼」和「翻譯ID」截圖或拍照發送至微信群，便於我們快速處理",
            "id": 151082,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151082/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91686/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150369Z",
            "action": 71,
            "target": "掃描二維碼，<br/>發送郵件聯繫官方客服",
            "id": 151081,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151081/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91685/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150299Z",
            "action": 71,
            "target": "掃描二維碼，<br/>聯繫官方客服",
            "id": 151080,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151080/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91684/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150229Z",
            "action": 71,
            "target": "掃描 QR code，<br/>加入微信群直接回饋",
            "id": 151079,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151079/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91683/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150159Z",
            "action": 71,
            "target": "若未能解決您的問題，可發送郵件至 <a href=\"mailto:support@immersivetranslate.com\">support@immersivetranslate.com</a> 聯繫官方客服，並附上編碼與翻譯ID以便排查",
            "id": 151078,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151078/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91682/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150090Z",
            "action": 71,
            "target": "若未能解決您的問題，可掃描下方二維碼聯繫官方客服，並附上編碼與翻譯ID以便排查",
            "id": 151077,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151077/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91681/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.150020Z",
            "action": 71,
            "target": "如果還沒能解決您的問題，請掃描下方 QR code 進群找客服，或發送電子郵件至 <a href=\"mailto:support@immersivetranslate.com\">support@immersivetranslate.com</a> 與我們聯繫。",
            "id": 151076,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151076/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91680/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.149947Z",
            "action": 71,
            "target": "我知道了",
            "id": 151075,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151075/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91679/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.149859Z",
            "action": 71,
            "target": "暫無開發者留言",
            "id": 151074,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151074/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/91678/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-30T09:28:06.149789Z",
            "action": 71,
            "target": "下載文件",
            "id": 151073,
            "action_name": "String added in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151073/?format=api"
        }
    ]
}