diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613376.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613376.json
new file mode 100644
index 00000000..2888732d
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613376.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHR/82MpA4ddfoDLt7jkSwY/6uci2atylbjj2fHpABC7IFe"
+  },
+  "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_1786613376.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613376.json
new file mode 100644
index 00000000..7c2659b5
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613376.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFQQfAha1x1y6YKcXWNQ1R3isw6L9Kr/Jyn+mJjhMrj3bP8EtIsQ0urvcKOX7vUMRaYl5qPARErNUpjodtOq7S9cac8QqhBS4mWh6NodjwS8Lnu6c7t49jh55LYDxzs3buc0lsG4X5n7AlDk7cZH8cujudvTODIFA5EGQbMust+szSSPk1evmSJl4v59tiRNixscP47mw1t32F8brDTujx9GmO8rC+lhTZNeShqbcH1k/XfvCQGcM7T7a5gxT5nrs7BScaruCQJBxSKFALmpuf2echsoeJFM0OmWdPN7qhVACsMU43ib5RwKwauuuFakevlMx+W5GsR5kzvgUNcrLZefuBBb/uYL+OUmb6MFN1JgwoLPNcFx1ypXlaUflzdxYYr7MXYWs7a/mHq/qpGyJcfL7kC8Whyu4EppmsJn+eA3NT3dAyNoU6ZEDaMKHcQ515q9WORALvB5V9hRNSvBMcmBb7obcxpxWYUeG0IQjeKed78xPqS8AjU54ch488wv7NzKiJFUEer2alh9KYdhQOf6ADhZ53duG2PoWKvRLsZ3iGkuhRF5wuM9P9FNs2TDFm6I5VPU1Wi",
+    "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_1786613376.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613376.json
new file mode 100644
index 00000000..b3821006
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613376.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGot2cH2x1bxuElxDrvU3nyWzk5d7SGMI4zghbA3VP4YvovQvM="
+  },
+  "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 2888732d..a8b1579e 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:U1RSTQHR/82MpA4ddfoDLt7jkSwY/6uci2atylbjj2fHpABC7IFe"
+    "password": "ENC:v1:U1RSTQEFa04WgDew4+qMlR3EjHB3fkStgYNu3SXHDhWOZTxe03y8"
   },
   "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 7c2659b5..29a44ed5 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:U1RSTQFQQfAha1x1y6YKcXWNQ1R3isw6L9Kr/Jyn+mJjhMrj3bP8EtIsQ0urvcKOX7vUMRaYl5qPARErNUpjodtOq7S9cac8QqhBS4mWh6NodjwS8Lnu6c7t49jh55LYDxzs3buc0lsG4X5n7AlDk7cZH8cujudvTODIFA5EGQbMust+szSSPk1evmSJl4v59tiRNixscP47mw1t32F8brDTujx9GmO8rC+lhTZNeShqbcH1k/XfvCQGcM7T7a5gxT5nrs7BScaruCQJBxSKFALmpuf2echsoeJFM0OmWdPN7qhVACsMU43ib5RwKwauuuFakevlMx+W5GsR5kzvgUNcrLZefuBBb/uYL+OUmb6MFN1JgwoLPNcFx1ypXlaUflzdxYYr7MXYWs7a/mHq/qpGyJcfL7kC8Whyu4EppmsJn+eA3NT3dAyNoU6ZEDaMKHcQ515q9WORALvB5V9hRNSvBMcmBb7obcxpxWYUeG0IQjeKed78xPqS8AjU54ch488wv7NzKiJFUEer2alh9KYdhQOf6ADhZ53duG2PoWKvRLsZ3iGkuhRF5wuM9P9FNs2TDFm6I5VPU1Wi",
+    "private_key": "ENC:v1:U1RSTQGLBbXyusB6RsJHWpmZ1XCBNh8oqm49m41GfXRrofiytfFZORj5zn16wp1TaLB+kKkOFjBiPDhRUqmWg3+lnQavM20x3g8tIcipYnl2Utfac24aVCxQwaJPvxt95U/rZjjg3fGIKpdfywVcC6kKYPiVQcGeaxiDyiz4TGEr2NkdQGvSAsS3cy62Kn2kNfrZE1Y5YSEoGmuFZdj4myqGVD06OWSRrturoH9nIzrSiFKemMKwXY8deTJp4LhXCaVi5kI7ZYO91pcP5KX4w8y2ZS2uNomZvgBos5lkTg22GOnfShiwdVfqeC/TMGuQvpdmEHyZJJjcsj8O+uqC1/5U2YQwEAnYfOzdmTVMTgmYRyufIqUFFRaIsPrBDhMrUrZvW3T04u0eUAaPBgsenMf0SEHk974OJazwxlkHZk1qZPGGRFU5dbaUnMoBFzP8PQphtPhEQI8L3gKqKgoYy1huT0OxpJWfKgZ+Dn0r4lubQfClUr+/BiyPpfVo/qEji4e24jG+d9GWUuxKeLMtO/UpKHVf34IZBfZv/w2W7OCH9Z+wH30S175MrKRlpeyLJIewpwRlW5kX0YlF",
     "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 b3821006..7022c81e 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:U1RSTQGot2cH2x1bxuElxDrvU3nyWzk5d7SGMI4zghbA3VP4YvovQvM="
+    "password": "ENC:v1:U1RSTQGo0G+vOUOjqnJahiLcyfY8J4i+M0l/cFSXUWydwf5lSp4Wueo="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"