diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615322.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615322.json
new file mode 100644
index 00000000..38bcc640
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615322.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEL1hAPCQlNCI6ICjQ/zAutPAac694jrLttIT3HVvMHirtO"
+  },
+  "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_1786615322.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615322.json
new file mode 100644
index 00000000..6d269999
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615322.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQGeonoFIKV9kcfa2WOwrxrOyQ7HD+5l5kVxw3LduGSI+s/zG3aj7xmtsLCXmd3ot7/Xj1KoQmaFobo7KnIpvyqMBdh055LvmlgDhNpwVCJNVXEKQKaNftLcga0sdKGbmVrEzb8LxaMc9WiQM0bprgqCXC21bWXs3wWaeXwateEI9b72QxuBCdCDczRoHoOmVypxNx79YoBjBT/X3DQXkMye3yLvjLzW5xcOb9Qzycq2Sx5BdBQlvQvunmp99Hws+1eplhOE7oR7Z6LGP1A1tgL5cE9q+ZQ/0yWZ6kIQLB+J5VRCSEQjr574ELJ05VZpetHP5ND4fdmR4O0BHQrdJXNMspTViGxPaoqKxZbqgkIKIhpSLo/Nb64hjFyqwxfOfazRhFdBi/k3EQUqCjTgpnKdy4he69Um6PIZY6RFFXoSZyx5vlhlNU2MEjsvYpfihw1GOxjX6s/OY9Lz17W+i+FOttLBJ7VUEKDW7NQo9sxkCMll7ADo1QpuKUmnPxe5LsqWEvvPB/W5Vrqs/9XbXz0I0SeLZig9FOy28vYpAACXidQ21IPnewMrgGsqI6DJjugcrXSKuTR7",
+    "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_1786615322.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615322.json
new file mode 100644
index 00000000..5f77ca00
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615322.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFW/bwmx1uhJkrfTX0dyvSI9CoZT9eVeQcuHo3qpJSwg2O7D/s="
+  },
+  "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 38bcc640..e2689ef8 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:U1RSTQEL1hAPCQlNCI6ICjQ/zAutPAac694jrLttIT3HVvMHirtO"
+    "password": "ENC:v1:U1RSTQEvp4wrXXRQmssXAZCYeSDftCwb3wGJoF0oRFlUGS6/KAFE"
   },
   "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 6d269999..ac931098 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:U1RSTQGeonoFIKV9kcfa2WOwrxrOyQ7HD+5l5kVxw3LduGSI+s/zG3aj7xmtsLCXmd3ot7/Xj1KoQmaFobo7KnIpvyqMBdh055LvmlgDhNpwVCJNVXEKQKaNftLcga0sdKGbmVrEzb8LxaMc9WiQM0bprgqCXC21bWXs3wWaeXwateEI9b72QxuBCdCDczRoHoOmVypxNx79YoBjBT/X3DQXkMye3yLvjLzW5xcOb9Qzycq2Sx5BdBQlvQvunmp99Hws+1eplhOE7oR7Z6LGP1A1tgL5cE9q+ZQ/0yWZ6kIQLB+J5VRCSEQjr574ELJ05VZpetHP5ND4fdmR4O0BHQrdJXNMspTViGxPaoqKxZbqgkIKIhpSLo/Nb64hjFyqwxfOfazRhFdBi/k3EQUqCjTgpnKdy4he69Um6PIZY6RFFXoSZyx5vlhlNU2MEjsvYpfihw1GOxjX6s/OY9Lz17W+i+FOttLBJ7VUEKDW7NQo9sxkCMll7ADo1QpuKUmnPxe5LsqWEvvPB/W5Vrqs/9XbXz0I0SeLZig9FOy28vYpAACXidQ21IPnewMrgGsqI6DJjugcrXSKuTR7",
+    "private_key": "ENC:v1:U1RSTQEbsIiQ/UcZ+3vlJycUYD3npcLYmePfRP61GOrmMnAB8hgEvu0wOiB74Rkj7U81hOOreZlOsP8PD3dSJTHdbJ9+/yy+hibNlxuAxpmNtnKN+GLfo3QJUCO7qWTkV7jZI64HBDSHlSGrGOecyfqdfcAN3TLi976kZKZakuBSzENbku0C3wCrrNeeRSeNO/LaCVh+vMKGxkcG65pAOBn/l/vDNWVKOBqs+Nye8GBR0hRI0lUi/Hy5IUVgOF4mDG9vv+YTkrWs3/ccIi5KpydsgUZEcihxlI2zx//UrNbICFE0HGsOhig74220Ii52YHOVBZQx2pZlUOWv+YdxHMoAI90FBaWjNjabgniG2Pby1F9cpdg+6K3w95n4amx4pwK+kmYA2BNU5QbMhsAA5OdCGDsou/oXRf4uBxWPZEcb6ZF+KJTk1h482x1qaXcZ+EebNviXdDy2tamuz8L9aaobI9A/77plMOraLLIBl9qisSSJd8V8LqkimI91xpw0JcnW3+uOxsPpdGjDL5ioaUPZzS3fmQ1b8woaxyuOlhiA7iNg3EuYLWmzjhLZPS611Kjx8Gss5V+ALQqQ",
     "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 5f77ca00..1e5378fe 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:U1RSTQFW/bwmx1uhJkrfTX0dyvSI9CoZT9eVeQcuHo3qpJSwg2O7D/s="
+    "password": "ENC:v1:U1RSTQFgTziE4H4bOjTlgj5lh5byQVSIJjSrMgjgvnqB3HGh/ITOQhI="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"