diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614472.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614472.json
new file mode 100644
index 00000000..46e45639
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786614472.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGtcnWQBW5TSz5cCPvAmyLN067aUi9PDr+/vjugzlcSbw7I"
+  },
+  "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_1786614472.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614472.json
new file mode 100644
index 00000000..a3324a8e
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786614472.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQGe6NkbMbpOpyZ84Wo7ySvTqLrChOnhIJ9JsLBpe9ADqESYTd95nOl9dHvEFpSufAeG9zpqMdQsYqh7J2F0tawStnh0GoFKi6wPekKu5yzyGpmIkIvwHVO5Vg+R95/0SnDnNUl5tbMRo53VNFRLqjhwAYBTV0Q9/3RFShXgo4t/zerMe3rmuRBrqusxk5Oopfza1eyYJgfFFvSSICE7c9qHGoAJIoeEGADaAZ3RNRo61lW4BTwxMhXALHX8kWO0u37f+20Q9Xn/zt+92zPZCqejyNvyWHa/nt2hRssvtNwGtZ9nvPHMxikDElSE2al6s58ltuGRcDElyU2Eyz+a5o/CxBWHOsCeolSFCQwEeYyo1KADzrRSpDL1PmPZeWiIJpBljXpPdQAIRDXMfqa09SwWZivgFMGT8ZekjX/ywfgDcDI4NlRlmZ4jQOubFpo/HvyXuqkMqc/9YX+cJ04krY7iZCts4atNPiD50OHHVqd6KpMD4qWjkDK+1PQ4z1rlSILVtvPg1y6qX1dQcLfLiYAyljgRrxd80zrgUFzyjbK3o0ehFD7FZ3ZtQ8zR5XKx2J+Dw+8OGgkX",
+    "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_1786614472.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614472.json
new file mode 100644
index 00000000..90e74f78
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786614472.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEQlLHuanl3bdoAWGvF4Ust9Q95T0W1chPpd2RRWzn1aUH8iMQ="
+  },
+  "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 46e45639..aeb8ec62 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:U1RSTQGtcnWQBW5TSz5cCPvAmyLN067aUi9PDr+/vjugzlcSbw7I"
+    "password": "ENC:v1:U1RSTQHZxpEylrQJ/2xp0kn6M9/eurtH7AqzDgI/N2OyS8CKHC5t"
   },
   "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 a3324a8e..01ff4daf 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:U1RSTQGe6NkbMbpOpyZ84Wo7ySvTqLrChOnhIJ9JsLBpe9ADqESYTd95nOl9dHvEFpSufAeG9zpqMdQsYqh7J2F0tawStnh0GoFKi6wPekKu5yzyGpmIkIvwHVO5Vg+R95/0SnDnNUl5tbMRo53VNFRLqjhwAYBTV0Q9/3RFShXgo4t/zerMe3rmuRBrqusxk5Oopfza1eyYJgfFFvSSICE7c9qHGoAJIoeEGADaAZ3RNRo61lW4BTwxMhXALHX8kWO0u37f+20Q9Xn/zt+92zPZCqejyNvyWHa/nt2hRssvtNwGtZ9nvPHMxikDElSE2al6s58ltuGRcDElyU2Eyz+a5o/CxBWHOsCeolSFCQwEeYyo1KADzrRSpDL1PmPZeWiIJpBljXpPdQAIRDXMfqa09SwWZivgFMGT8ZekjX/ywfgDcDI4NlRlmZ4jQOubFpo/HvyXuqkMqc/9YX+cJ04krY7iZCts4atNPiD50OHHVqd6KpMD4qWjkDK+1PQ4z1rlSILVtvPg1y6qX1dQcLfLiYAyljgRrxd80zrgUFzyjbK3o0ehFD7FZ3ZtQ8zR5XKx2J+Dw+8OGgkX",
+    "private_key": "ENC:v1:U1RSTQEC6ySeWjeM7dVK/N1ltZ+lgRZAbrCKq3zqckwWMX4pJzeVm3nepppuocVjTBAGaeD89a0x/sfC6E3iQbylH/yXGyTwwCT6T4Qprsee9A1kvsYKGW26Z4gw0LPaJPEAfAWJWVWVJHSPQRs0VbyQW9ODckTQiQ73ySWK7ZjG/iOWi2ieHJbgdWk+TLbNBsY8kMshtY3UgoJJhVmSMGUTsOoiV4EogL6mABCWKOQWOMGwyeS55HovA7Fo1QzTqoTaY+qVlxrw8/ZhBaHyLFUiMVGC0dhrDu1n9EDs3FOvNF9yGDR5MTBUtQpcgNjRJBwOiGXsQBeiYNupSKAYWcZdwTFKvLTSGnr4GvZGSK0xkUCqYc2x4MByRG6D5UmLB8dRO+rHZkHb0GV2QLpmGUzwIR5j/JQ6XN4/zLRhpKXNZo1G2GKUROfElBfV5Vge/SPlaUuM6of5GGRzRIAyibdsUsOxXMNRzrzfH9UGUEG/fMeeJgHfit9gOx2Z/FVRoxWxtiuc7TyJ+H6GS0Q+PqXbxi1IvsZN1UaWC/VLpASj4d3O6PHcn0npeiWu8ssl54Xb1gffBr43kztZ",
     "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 90e74f78..bd2f9364 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:U1RSTQEQlLHuanl3bdoAWGvF4Ust9Q95T0W1chPpd2RRWzn1aUH8iMQ="
+    "password": "ENC:v1:U1RSTQHZwPO2BY2PQQFfTplITsf12tms2hh+jcv2LpvT/EVQUNTW8aE="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"