diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611627.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611627.json
new file mode 100644
index 00000000..b5532b22
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611627.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEDECRDUZAesXSoLqDA4BQDNiaw7lsHSGyW7GAPrKiIF7Ak"
+  },
+  "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_1786611627.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611627.json
new file mode 100644
index 00000000..39fdc945
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611627.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEo6VhZA9qy/Z0TYrsIgX8cwmFld9RJaUNnz5cg93fNaxan9ds1E2MAVTKoObrocns/KHgocin9FyQdRV/1YukCYyDqR46rshS0qV+3Em0LWlomjFmddYZTYY7DxAdyxvg75aN0nvLGwNZbKukeM7H7WNIGTV8TQHts90sEgBWO3Nt3yayHOf+MgF8KnWvpDgzKQ6ErQMAxQZKU2Y3t5JjBTTzLCJGt7QfpZfB/JSRgrzVuRdLyUq5/mHwWoSeOXwMm3IG8mhs+zKYaeKfwcvpc3/UeaLzLm27Xo/aXbJlAfOWcvJf35ZtezhZUECFGZjVo6iecvVbRV2r585PDmKC9HbnKA/7kr5ahvVZOy4dW5c8ivYnaCpX1hk1GB1hy48kUBAf2rpPKxFXk66pnGvfZoJpXSOEBHmOImuM9fGu97vcjsWyIf89ofFCpsMhOohofhxpNJZPuO9sPtjA4Bx3qKbtAWauXcC6eUzhdm84WjjrpU3OFPiwFC9VKdegKDE1Hp3JCt3sJ+DGOPp02gYmUnYGy2hxw7zJ2Et7SC9+1W3hojmd80D2SLyJdXQ7/ZIbiwEyUMKGJ",
+    "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_1786611627.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611627.json
new file mode 100644
index 00000000..2cdcb1f6
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611627.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHa5kNy0TGgHWql70uh4qOOEHsDB8ClEQkQavXCAmEshOegcvk="
+  },
+  "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 b5532b22..5860c033 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:U1RSTQEDECRDUZAesXSoLqDA4BQDNiaw7lsHSGyW7GAPrKiIF7Ak"
+    "password": "ENC:v1:U1RSTQH4lVQDpwEEF1NOgObnqgCVrZG5u4aALjPyN/rpaf5ylLkG"
   },
   "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 39fdc945..32fd8c79 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:U1RSTQEo6VhZA9qy/Z0TYrsIgX8cwmFld9RJaUNnz5cg93fNaxan9ds1E2MAVTKoObrocns/KHgocin9FyQdRV/1YukCYyDqR46rshS0qV+3Em0LWlomjFmddYZTYY7DxAdyxvg75aN0nvLGwNZbKukeM7H7WNIGTV8TQHts90sEgBWO3Nt3yayHOf+MgF8KnWvpDgzKQ6ErQMAxQZKU2Y3t5JjBTTzLCJGt7QfpZfB/JSRgrzVuRdLyUq5/mHwWoSeOXwMm3IG8mhs+zKYaeKfwcvpc3/UeaLzLm27Xo/aXbJlAfOWcvJf35ZtezhZUECFGZjVo6iecvVbRV2r585PDmKC9HbnKA/7kr5ahvVZOy4dW5c8ivYnaCpX1hk1GB1hy48kUBAf2rpPKxFXk66pnGvfZoJpXSOEBHmOImuM9fGu97vcjsWyIf89ofFCpsMhOohofhxpNJZPuO9sPtjA4Bx3qKbtAWauXcC6eUzhdm84WjjrpU3OFPiwFC9VKdegKDE1Hp3JCt3sJ+DGOPp02gYmUnYGy2hxw7zJ2Et7SC9+1W3hojmd80D2SLyJdXQ7/ZIbiwEyUMKGJ",
+    "private_key": "ENC:v1:U1RSTQEl6uQAD8DkfGmnr2rwv6Wo7HtG0yLcK9PF/9LirXxf6UPNvIYMdhZxEcZwwV+e4lRXcDdSd3h120pL0L42XYG13FxsxYUWjsvI3oSHDymUwPxT3vAJCSQHbzybY6MFM6W5kTEBDHBpPwvRwFWo1KZ3QgW7Uy0bUl/2yLG7LIYkkYiBC3W+1z6bQgaZOpmCA8IfcZwP0uSD47nRmUhb8/MjsKFJ1LtSYrVemokHr3ZcRUD+FaYxzEWbMjguV7bD2a9ZvONsa7G7Slc2ashyGSIGweMuy56+VkO50HTeHnIxKmIB37c1bk4vZQ0509deyqSSFKiFq1K4735PRJ09sjaRAeix94+tvv/Ekt4Xy8C+M8Ocoh+0PkSBVR8NnafXj6+/D199V51AdCfRgeLVgY/tas/DjZhfwvzNrN6Pcl8BNIkv36EwNPAl9eWybbBszBRxQCGVy+cQl+7FZxmNsD+g+kjGpwMcWxVstUlZTmDy1zpMMTEWN4U1SBzAEAvLuVlAt9G7Jsh7BysDcX3m6VIk2IaseUDo0FRFj+7+LwbTWaGhd/rGBilTQWSOla9+4pvvvhoDmzKa",
     "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 2cdcb1f6..6e2e1630 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:U1RSTQHa5kNy0TGgHWql70uh4qOOEHsDB8ClEQkQavXCAmEshOegcvk="
+    "password": "ENC:v1:U1RSTQESSEyVlLIOHB0i21/ei2IW1Td48GQZeRJv28RxDfbwQzGdYao="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"