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

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

diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609820.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609820.json
new file mode 100644
index 00000000..d5be9d07
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609820.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEWMrWfSavewmvArscU0ghcrSNvi+lztXb8nZ9tTXgKs41k"
+  },
+  "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_1786609820.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786609820.json
new file mode 100644
index 00000000..e8eb4b96
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786609820.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFS3TZTZ4VSoeXgVXfnwugpS+X5qecrkIcm9bFjJ30nvuCMzfQpuPY9Z2XqibZYwY/UBOpZGdBu9GJAo9KU9E0JQ2zfZnD3o0VbPtmAl3XAkC1+W0SBlHsQUcXf/6NLQ23CjiElSgMHiCKEVOd6i4ugUXiIoqtLllrwJyIFBurtos9qbiVn2z0Nazlg8R9M5ZlHAAIytqkBIXQQaZorE35f0Z2plqIqpqnrPyR9iHXgK4DKDJJH7hvEzGegH/gL8cNJmSLeaIzKlOEH2i8E3Hz0riKVAffKNwIc9hnNSr2Lnil0d9YtjskLSY1ccPrQvGS/q0jht0XPCTBqTzPVlYuqbSFAwfJda87dSyFfQ2mVY7yCkKLGlbRUJYt5x00S2SJhbraxYkZJXWUnppEcPl7ojvHwk52HHPbrUVYAo+m0BJ/AJFf23eWEyV82GEddaZJ16x090MUFIkKqmTVfiYRut0pushi2z7ExcGC85MdlCka5sbA6CQa2tG/X98EMDHrmEx527IISsrLpAWSl7jOaxkgLZPEltW/PGqYcIlh5ZHUZYfxMCpoCBrd759hZCeb5yWuKalDo",
+    "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_1786609820.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786609820.json
new file mode 100644
index 00000000..cb9d745c
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786609820.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGp0JftlrxELSxnFEkIxEKdtDIKNutAOKwazB73rc7lZxvo+QI="
+  },
+  "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/backups/conflicts/sync_meta_conflict_1786609820.json b/backups/conflicts/sync_meta_conflict_1786609820.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786609820.json
@@ -0,0 +1,3 @@
+{
+  "version": 1
+}
\ 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 d5be9d07..8f223251 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:U1RSTQEWMrWfSavewmvArscU0ghcrSNvi+lztXb8nZ9tTXgKs41k"
+    "password": "ENC:v1:U1RSTQFW2wrKjtgiJCGk7H7d1wXJ2YYgjvaCAxNh+8voRLk/fieT"
   },
   "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 e8eb4b96..10d3a985 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:U1RSTQFS3TZTZ4VSoeXgVXfnwugpS+X5qecrkIcm9bFjJ30nvuCMzfQpuPY9Z2XqibZYwY/UBOpZGdBu9GJAo9KU9E0JQ2zfZnD3o0VbPtmAl3XAkC1+W0SBlHsQUcXf/6NLQ23CjiElSgMHiCKEVOd6i4ugUXiIoqtLllrwJyIFBurtos9qbiVn2z0Nazlg8R9M5ZlHAAIytqkBIXQQaZorE35f0Z2plqIqpqnrPyR9iHXgK4DKDJJH7hvEzGegH/gL8cNJmSLeaIzKlOEH2i8E3Hz0riKVAffKNwIc9hnNSr2Lnil0d9YtjskLSY1ccPrQvGS/q0jht0XPCTBqTzPVlYuqbSFAwfJda87dSyFfQ2mVY7yCkKLGlbRUJYt5x00S2SJhbraxYkZJXWUnppEcPl7ojvHwk52HHPbrUVYAo+m0BJ/AJFf23eWEyV82GEddaZJ16x090MUFIkKqmTVfiYRut0pushi2z7ExcGC85MdlCka5sbA6CQa2tG/X98EMDHrmEx527IISsrLpAWSl7jOaxkgLZPEltW/PGqYcIlh5ZHUZYfxMCpoCBrd759hZCeb5yWuKalDo",
+    "private_key": "ENC:v1:U1RSTQFiDXAuUhy10vzokpLTy+vid141p5/yt6e5/s7QFfhTnAKfs9VB6bhwko9yaHRk/ZaNtX+72Bje9nWHuzbL2co0nlA6JElgPKPzcA8BnBNq7t6SnXvmpY98KE8eOe1dQoHgkemNOar9SCt1B/jJpN7eZriOnkin2d2jxGfRLSa9mWEDCVpwg07sKSALp3JReyeJ1Bb2ca/B4ODtyln5CNea8Z6Gq8DgXak8y6iVOa0jxaKr3y7m1Bob+NaxEm+RrDGGjrsFMmc+JLBfDh9JXpYgPQwlup0ZYk9v10spBp35FvnX25csoEa8S//+KQuiriyyzC2fqeWQfkRixe+Oe8FPOW/kfzEbuLyDB9zbOC3zBWtKCeTCtrsk3er52RsH6ZQS2vp4CuNhs9r3rFxRG/Yy7khCbmFUCdFrG1tcQGtv3DRhXOWQHJz1FTzAvHer60KAPKs/WzX68aBi6IPvYozBM+keFgGIx51vYV21MOeHjRZa7epwRxxNGjJpIWk+lbzFvyUjEeU624XAbKQOJjDbhEGLItaagsgTX8qcMe9gjWf8Oyu/N1UCDVcyIQDMkvFRhXOdQpNb",
     "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 cb9d745c..a5789fc0 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:U1RSTQGp0JftlrxELSxnFEkIxEKdtDIKNutAOKwazB73rc7lZxvo+QI="
+    "password": "ENC:v1:U1RSTQHsduF9wNTBTcPIR1VZmobD6A/xel8UisHbRqxsnI4NhWzTXZ0="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"