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

---
 ...-4ce3-af79-5643f067cea5_conflict_1786613010.json | 10 ++++++++++
 ...-4525-bff3-e09a7a2ffbff_conflict_1786613010.json | 13 +++++++++++++
 ...-40df-8abf-c80601af2708_conflict_1786613010.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_1786613010.json
 create mode 100644 backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613010.json
 create mode 100644 backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613010.json

diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613010.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613010.json
new file mode 100644
index 00000000..c30640fe
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613010.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFxO3oucdPPm9UnEuOnit/nvouEn+m78NFyS4MWI7ltZAoG"
+  },
+  "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_1786613010.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613010.json
new file mode 100644
index 00000000..46b50a56
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613010.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQHsFTwyIFf240oAunhZEbSeIwNPbUC4bJ/KO6hPeFKyICnJqI/Ou2yfm18phN0P0N1++DqTKks8BWjwoU6UF6f4bew1S0sqrL0xEYaUGJkquQ5PjvrZ8drqETOu1MWCu5qXkpBUvCU8JHAg8DXVqzfWSALM0zcxgQL7sKRrbHYB2jFtDQmy0ggDV+3jAx5P6mCRozUZ6XKb1Jv+1HVqeNd0/wwxUamBUMbogJSVscL6jI49HPgoEOVREBBMbuX56KeCkrYDA+3tO3xwCeGu7l7SzBlH1CSB/nrJuoXpkRS7EcoV1V8rdcUMcnivEMJV56y4+0/x09q2Azn6OMPLvz2g+qPL4OdkHpNu6uARjHhTr06wQcj3jMSTWXYEqZ5F+2+IoQR9pa57bhN04JNVZVF9fXIcK9zE84wvjnE71ASY7d1UPiMVug+uX+9vpFVZRq00cnTiD5uJEEZEFbdxuOn6kC91Sp99Da4z81zHNYdpjR6aHN/HWUeciv2d8esXIzmSrH9NxKx5UUCkBt92AOxEaIs1knqXsYJynp3ETczw82TlInXChyAMbDkdYHJAVrdCxTxpZxo+",
+    "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_1786613010.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613010.json
new file mode 100644
index 00000000..01c966fe
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613010.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQG6j4aCgWkRL10ksL4ZLu6pUB0g9QGokKFdYNafmU2I5XLJufs="
+  },
+  "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 c30640fe..871baf27 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:U1RSTQFxO3oucdPPm9UnEuOnit/nvouEn+m78NFyS4MWI7ltZAoG"
+    "password": "ENC:v1:U1RSTQEi27IJRFxfLUpDhF7Npa+tpjzv+dVua9wJI6mFWOXjgXUw"
   },
   "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 46b50a56..19ae9d13 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:U1RSTQHsFTwyIFf240oAunhZEbSeIwNPbUC4bJ/KO6hPeFKyICnJqI/Ou2yfm18phN0P0N1++DqTKks8BWjwoU6UF6f4bew1S0sqrL0xEYaUGJkquQ5PjvrZ8drqETOu1MWCu5qXkpBUvCU8JHAg8DXVqzfWSALM0zcxgQL7sKRrbHYB2jFtDQmy0ggDV+3jAx5P6mCRozUZ6XKb1Jv+1HVqeNd0/wwxUamBUMbogJSVscL6jI49HPgoEOVREBBMbuX56KeCkrYDA+3tO3xwCeGu7l7SzBlH1CSB/nrJuoXpkRS7EcoV1V8rdcUMcnivEMJV56y4+0/x09q2Azn6OMPLvz2g+qPL4OdkHpNu6uARjHhTr06wQcj3jMSTWXYEqZ5F+2+IoQR9pa57bhN04JNVZVF9fXIcK9zE84wvjnE71ASY7d1UPiMVug+uX+9vpFVZRq00cnTiD5uJEEZEFbdxuOn6kC91Sp99Da4z81zHNYdpjR6aHN/HWUeciv2d8esXIzmSrH9NxKx5UUCkBt92AOxEaIs1knqXsYJynp3ETczw82TlInXChyAMbDkdYHJAVrdCxTxpZxo+",
+    "private_key": "ENC:v1:U1RSTQF9ddKnB+i/dlrovmhfsy6Wz6gpa8SkjcNCZrRbBaeLbhdsgVO8hdTdCIyK+Ku3FTsi2voOVAv4tocnByI39vQyI6QH2ULbGH/wRRYoyu93bspECe95Vi271cHlVDJ6LVcm0aGqwMP+EU49qQMFoqRz0kLzR0V61Mj9HuEM0dQHQfMrlP+rRy0bElK9qRyQinw4kJjTP6uNt/cl4vjg5bFjJPdGEwROggsNQIPWUVeD3S0teFRrv0f0+0ANqqrB01kQsJj0TylZlhQckFqn61eA92Pvrg1bpctz+r0ll0gixEISn2QcdgDuo6R9YuiZ66675g1rcgIS2jVk1L6C++P9d9B8QIwSR2Nydv+dth8P97iE6S4+FPXaQ9LRvfLzpOgj7/kiNR8Ho0jHrTaMkUIWRCN5Rqw+rkN0pR3A9s7NDx/GsJ51NI5wq9Cs3CquxIbVer9PuPUR/iUDeLil/PT9g6tTtL2hygNXd9WIdxGwuXa5fqA+4YmW/xMI5d5tR3X37QXE+j8fACGSqhd6n1OlotiDL7Rk+A28kcuDgyNVdLG69yvzrnE1q1dgXiYckXfszCNQ/2st",
     "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 01c966fe..3b10bb38 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:U1RSTQG6j4aCgWkRL10ksL4ZLu6pUB0g9QGokKFdYNafmU2I5XLJufs="
+    "password": "ENC:v1:U1RSTQHSfRI6DdnxAuOhMeo6z7Xw9y3qbSEcukuELOM70c5cRlpdX0c="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"