diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615504.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615504.json
new file mode 100644
index 00000000..0fa8508d
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615504.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHR0v43hcOzbtFz11oiQkCk8579PyOe26b2g9U8TpIiBtwr"
+  },
+  "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_1786615504.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615504.json
new file mode 100644
index 00000000..9e717ec1
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615504.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEciGcd6bOe3klpKcWmePPzCG8TgMu6im7iIVLZ1hFy6+Zd6WBTD7KYXbRBZ47U1M6cKpkzd0pK94buaF5yoW0mpfOT9+jnnyA/KIgksajgADKoNBe2dwRDRJ2AAFD8Ce5KYh4AgveeUh89qQo4eOMrOLrviKy9okRLf1uSJwAyx3CkNC4dsibedYmSiLdVM1GGkImqpbz3X/tRJrYrAEIFPSUeQvjGumstUx217K8cIrdDLDHsf4Jtte9R3ZFu0ugLRXbUBUw4I3bMXeKFjMsfwHgZVeO9cKDECj/gR8hS06Sue8Te32FzFjIXupIWu3JZeWHjtKGkwSbJyhxp7+YDrtwuEAdjVBUxePZ0E7aTZg5EMSVg66hAUaDbeIVRCj12Co5mpElyVri3isdfAMM0KTjfAmdCa5AmAo0qIQ5nvIdWUAWFj2aqoYCvkZjwtPLp4PomvGGDMqluXLlc626gEPGeyrIPr91JnHdBLMGkMqE3v0BXvka3h+aX415+FQ9iI+a43UktM32pSv5RrwNPeeiNGiVoRitLxImPRfTq5ZSHL4Le/8ky3aTs3J1nod6sCCML5h0b",
+    "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_1786615504.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615504.json
new file mode 100644
index 00000000..b6df1f89
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615504.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQF3XRQ2bLexeNG5N3pw0TaOjxwx7qpACLhghICZ6O2X38jYvW4="
+  },
+  "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 0fa8508d..27156a59 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:U1RSTQHR0v43hcOzbtFz11oiQkCk8579PyOe26b2g9U8TpIiBtwr"
+    "password": "ENC:v1:U1RSTQFZeA8UFGg3czPrrI0maekxzfh7rcefdGjdIINzGeE+Tc0h"
   },
   "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 9e717ec1..9fddc4f9 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:U1RSTQEciGcd6bOe3klpKcWmePPzCG8TgMu6im7iIVLZ1hFy6+Zd6WBTD7KYXbRBZ47U1M6cKpkzd0pK94buaF5yoW0mpfOT9+jnnyA/KIgksajgADKoNBe2dwRDRJ2AAFD8Ce5KYh4AgveeUh89qQo4eOMrOLrviKy9okRLf1uSJwAyx3CkNC4dsibedYmSiLdVM1GGkImqpbz3X/tRJrYrAEIFPSUeQvjGumstUx217K8cIrdDLDHsf4Jtte9R3ZFu0ugLRXbUBUw4I3bMXeKFjMsfwHgZVeO9cKDECj/gR8hS06Sue8Te32FzFjIXupIWu3JZeWHjtKGkwSbJyhxp7+YDrtwuEAdjVBUxePZ0E7aTZg5EMSVg66hAUaDbeIVRCj12Co5mpElyVri3isdfAMM0KTjfAmdCa5AmAo0qIQ5nvIdWUAWFj2aqoYCvkZjwtPLp4PomvGGDMqluXLlc626gEPGeyrIPr91JnHdBLMGkMqE3v0BXvka3h+aX415+FQ9iI+a43UktM32pSv5RrwNPeeiNGiVoRitLxImPRfTq5ZSHL4Le/8ky3aTs3J1nod6sCCML5h0b",
+    "private_key": "ENC:v1:U1RSTQEnbW0AWugowFQ9ZZXFd8ksBv0Uy5e+Xh84m1AZFq16URDDf+mYV54/JY/xd7K8RMKmPRcPiqbB01pfk4dJP8FLIUCmdnv0g/K6yrddSDOx/BdhpfWpNCufidimqZF9yZnPZjHHw1oqC5jc2o8kSOlK4iPQ0stUdth5ryn3KXrolQPhN6oatSt3Og3cB8R+OBzrV/cKgS0xCdw1/u8fKDc3G4ocKFIWWv2GiQ8b1kyVlPQ3kfmVJKK1qxyob5cgseOLLCOZVBBL45ZjM2cGO6v0wY2ZUgxRzcqhTZZTHbq3pL/OXzQNJ54pMXP8ioZFoM6qQbJGhX6V1i6Wgjd1vCNLJTDuRwhdvPrBlChizMRem9bL9d+hbYcdw0HEDUhadEpzgEbKqHo41RIzYPttCGTP1WsUjdeEh90CEz8CbUioOeIS+rU9Ecj0YH8Vd8wGQuTr56jCzLmFCQazfgcXet/xw/qQjlDx0Zl0optLi8Jidf0G+CnS2XM6NyouhUpL1+z244chHSKdOhLhgGUI/hPQmVLJfXUKgB4aIjvWYz/vlKI19IVJCUIMklsY//yhUtkfV170QGv8",
     "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 b6df1f89..30c7842f 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:U1RSTQF3XRQ2bLexeNG5N3pw0TaOjxwx7qpACLhghICZ6O2X38jYvW4="
+    "password": "ENC:v1:U1RSTQEynMwVZIptIZ8EEUXYgaEEhMimOGzFH3MnCoTZ1+DIY9M03/k="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"