From 17bb0ad0ad835f059b8918f689c021d84d06523a Mon Sep 17 00:00:00 2001
From: sTerm Sync <sync@sterm.local>
Date: Thu, 13 Aug 2026 16:22:28 +0700
Subject: [PATCH] Auto-sync: update local configurations

---
 ...-4ce3-af79-5643f067cea5_conflict_1786612888.json | 10 ++++++++++
 ...-4525-bff3-e09a7a2ffbff_conflict_1786612888.json | 13 +++++++++++++
 ...-40df-8abf-c80601af2708_conflict_1786612888.json | 10 ++++++++++
 .../3487a977-1ff7-4ce3-af79-5643f067cea5.json       |  2 +-
 .../7db2f101-b275-4525-bff3-e09a7a2ffbff.json       |  2 +-
 .../81915847-1a38-40df-8abf-c80601af2708.json       |  2 +-
 6 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612888.json
 create mode 100644 backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612888.json
 create mode 100644 backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612888.json

diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612888.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612888.json
new file mode 100644
index 00000000..851cd854
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612888.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGJzZPv4CXq4VDLx55FaEPNg8LE7Udb2j186qdNv4IsmbNm"
+  },
+  "created_at": "2026-08-13T04:15:02.456656+00:00",
+  "updated_at": "2026-08-13T04:15:02.456656+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612888.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612888.json
new file mode 100644
index 00000000..26dfdb30
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612888.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQHcaPcBum2ZnLT9myBro0/4PpRUzHnJueAhwxLj3xEiqEaShZnW+F/0ZossQsQDUJbXb79YGl0YeeheUYHEesmCkABMA9BRrOzVNbjF+pWz3uqUni0N+HooR9C1puNr0Gogss5Edl7wN47p3/imJZr46QMRxs65WdHtl/2JFfDRFulpyhIUPFYiX5EhqFRw0WWKHiAsr98YlC7LFk3aofyq5x4JnepU7SkuNBD4Jc4k2jAbj1Z0iTRJn8WGu7k5Q2YIWdSGVO5jqsXheqpQlwZeLbQItSkA1UTl37bQJwShty9BVJOigQKiQit1hQ9n2alRyKzbbD9z657avzNhfuyt3X6/2+LwMSRyiShLkYkMmnHKyJzPSPVA7FrguTnqCoJUnqz9VgsFCREu7q+rCa/6/chrxxN5jXtdGixGLnBNBDaq99ujriShXIRh0Pk9OCXr2hejuVZGO40xPdOd5WVnigLj1wiG+Oradv/mq9z46AoLWB2aObEv1LEpr53eJHlg3wlaXI8XAkGsHr9SWdNZRUyx27KRUUzy7/8F9f88jRs52FcEAgf5Tl8/ZuhU5bclPO6GYsw5",
+    "passphrase": null,
+    "key_type": null,
+    "fingerprint": null
+  },
+  "created_at": "2026-08-13T04:11:59.658692+00:00",
+  "updated_at": "2026-08-13T04:11:59.658692+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612888.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612888.json
new file mode 100644
index 00000000..68094117
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612888.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGatTiZZTgn/DZgQcJKuR0ECCdl8FHylsfA6ggykNtYCAUucfc="
+  },
+  "created_at": "2026-08-13T04:15:22.425983+00:00",
+  "updated_at": "2026-08-13T04:15:22.425983+00:00"
+}
\ No newline at end of file
diff --git a/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
index 851cd854..debd7207 100644
--- a/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
+++ b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
@@ -3,7 +3,7 @@
   "name": "oev-123",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQGJzZPv4CXq4VDLx55FaEPNg8LE7Udb2j186qdNv4IsmbNm"
+    "password": "ENC:v1:U1RSTQHud8P6jUB7TIv1ifZ/WtV1/3gtFYWoy2gVdCfnF++G881n"
   },
   "created_at": "2026-08-13T04:15:02.456656+00:00",
   "updated_at": "2026-08-13T04:15:02.456656+00:00"
diff --git a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
index 26dfdb30..89a6e772 100644
--- a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
+++ b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
@@ -3,7 +3,7 @@
   "name": "oev-private",
   "auth_method": {
     "type": "private_key",
-    "private_key": "ENC:v1:U1RSTQHcaPcBum2ZnLT9myBro0/4PpRUzHnJueAhwxLj3xEiqEaShZnW+F/0ZossQsQDUJbXb79YGl0YeeheUYHEesmCkABMA9BRrOzVNbjF+pWz3uqUni0N+HooR9C1puNr0Gogss5Edl7wN47p3/imJZr46QMRxs65WdHtl/2JFfDRFulpyhIUPFYiX5EhqFRw0WWKHiAsr98YlC7LFk3aofyq5x4JnepU7SkuNBD4Jc4k2jAbj1Z0iTRJn8WGu7k5Q2YIWdSGVO5jqsXheqpQlwZeLbQItSkA1UTl37bQJwShty9BVJOigQKiQit1hQ9n2alRyKzbbD9z657avzNhfuyt3X6/2+LwMSRyiShLkYkMmnHKyJzPSPVA7FrguTnqCoJUnqz9VgsFCREu7q+rCa/6/chrxxN5jXtdGixGLnBNBDaq99ujriShXIRh0Pk9OCXr2hejuVZGO40xPdOd5WVnigLj1wiG+Oradv/mq9z46AoLWB2aObEv1LEpr53eJHlg3wlaXI8XAkGsHr9SWdNZRUyx27KRUUzy7/8F9f88jRs52FcEAgf5Tl8/ZuhU5bclPO6GYsw5",
+    "private_key": "ENC:v1:U1RSTQHPOsrLG2EsfCiyMoVIyvNuB3+d54ZptLHqs0iQ5PXWBtADYxIEshnuhWnvI2x4YFNnKfaUiP2WAxbrp7mR06fGcHJfHLGQnyle/B0UsV6sAHmo9nBViKCh4omYSMzythco4Kg64tLOMjSn8bVX0keUKNBsiZkUwHvtw+ut/eoZH3B+wU4qJnjF/otRJ47nTHEJiakrEYr/bunzOY/Otb7P4wBcilwPjh91bxvKSGWXOfZLojkxiuT/xRHdTnRu0mG+0knxjgmIEWM5ymqwiQ6ZEcOnlmtMwAHEtyClNgwElsrhiN+nJRwNcKXcOgq8WImevVwvpn+iVFM4ivYC/6XABHX+ZBI2t9I4TusgI4B9eKaMv3olg3nerRxxz0v7nRr+YCsJUYB19BeHty5mqfgTrM4+8Rr9xHDtT7lF1VrdkHt3Y7DTQbQfpQpz9WWXdXtOUfwb9Y46VFteBQ+fffswlmgIoU9QOWD+3wi5hTW61BQJX6T4/GLTviYitwZR52NbQXy8x4PInJ9JUnMbsL83cpnL0RCPZidS5ELmJOWYCvFI6hoibgwSFvCbAPS1C4qpTS8TiapN",
     "passphrase": null,
     "key_type": null,
     "fingerprint": null
diff --git a/identities/81915847-1a38-40df-8abf-c80601af2708.json b/identities/81915847-1a38-40df-8abf-c80601af2708.json
index 68094117..d99cb5cb 100644
--- a/identities/81915847-1a38-40df-8abf-c80601af2708.json
+++ b/identities/81915847-1a38-40df-8abf-c80601af2708.json
@@ -3,7 +3,7 @@
   "name": "oev-2025",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQGatTiZZTgn/DZgQcJKuR0ECCdl8FHylsfA6ggykNtYCAUucfc="
+    "password": "ENC:v1:U1RSTQG7m6wF//PKlZV8br6jeZh2RIXY7CWGSAUjaTYH7JhX2EchxQA="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"