diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612109.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612109.json
new file mode 100644
index 00000000..afd140cf
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612109.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGrEx8qzXXHj4sSaGTeftQ7CaWIhOPvysyOlr50Wi5OVT96"
+  },
+  "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_1786612109.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612109.json
new file mode 100644
index 00000000..7a6eb196
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612109.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQGnQur6oouwlXQrNMxEemWR9c51SJwVx8pE7U7LpV4DDrTe/cD08HExJJNBx95qCAzj8botxmocEcBJ3YGwajDK8/ZN1WYoTGlt4/A4DvsfDHNopzLQz37YkwgwO3xsxDiIzJ8g1CxSS8BNz+89SpOsyaf6aQlCAOSpbrc9/fyBCSwv/h9ISVJdAGtRXqrkrCLGectNCH6EjGefguXjHLyDeHRGMMY9Gr1oG92JPzy9COXNEza68ko9bbx5pay9O/BGLzwRVfkktdZmLperUexEOHrKEFoAl8dxuHMhf1nlrajGz0l+Fe1iCLTwAnx+ysKbjApD9HLZtIVOyoFccGl148wJtDGLIqoiZ67QrBaKh66qY/65UDq60aawGqvy7TBjBraJxm0tRIsRHgoJYT7CJmPLhAiVW6gzQ8E3R9zjmidajqslRAu1hGgFbP5aCQjODTjk4q+GdpX8LkdGUgGXP4yAGW6Gz4+VouDS/Q+zhfrbQBBEFmGp9EGUfFeEEHLtFqvTc0Hz2CcT3IAkLpNqt//O+Swqv7l/FebB0GSJglvp99YguhipTaGXtX5bAYPgtl7O9eWy",
+    "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_1786612109.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612109.json
new file mode 100644
index 00000000..d35053c4
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612109.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQE0x7ciXR3xo3FNGei9HWrEjpdDMfMeXGcwsjyMZLPpZjWgO/k="
+  },
+  "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 afd140cf..eb87481d 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:U1RSTQGrEx8qzXXHj4sSaGTeftQ7CaWIhOPvysyOlr50Wi5OVT96"
+    "password": "ENC:v1:U1RSTQHbB4R2jkdUUV7DNWLLjqTBCgyF2IG5tuZraR6L3zoVxT8z"
   },
   "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 7a6eb196..b8e77c21 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:U1RSTQGnQur6oouwlXQrNMxEemWR9c51SJwVx8pE7U7LpV4DDrTe/cD08HExJJNBx95qCAzj8botxmocEcBJ3YGwajDK8/ZN1WYoTGlt4/A4DvsfDHNopzLQz37YkwgwO3xsxDiIzJ8g1CxSS8BNz+89SpOsyaf6aQlCAOSpbrc9/fyBCSwv/h9ISVJdAGtRXqrkrCLGectNCH6EjGefguXjHLyDeHRGMMY9Gr1oG92JPzy9COXNEza68ko9bbx5pay9O/BGLzwRVfkktdZmLperUexEOHrKEFoAl8dxuHMhf1nlrajGz0l+Fe1iCLTwAnx+ysKbjApD9HLZtIVOyoFccGl148wJtDGLIqoiZ67QrBaKh66qY/65UDq60aawGqvy7TBjBraJxm0tRIsRHgoJYT7CJmPLhAiVW6gzQ8E3R9zjmidajqslRAu1hGgFbP5aCQjODTjk4q+GdpX8LkdGUgGXP4yAGW6Gz4+VouDS/Q+zhfrbQBBEFmGp9EGUfFeEEHLtFqvTc0Hz2CcT3IAkLpNqt//O+Swqv7l/FebB0GSJglvp99YguhipTaGXtX5bAYPgtl7O9eWy",
+    "private_key": "ENC:v1:U1RSTQEauwdNzp0zPNs4ZNg9VaQlvGlJtavpew7c/n14qaU5uIY0VYInbwdZG+Hi/LdudwvQCOpFgfStZJ7jxMmBZ8ep16OxfEBDcfMC2VUpYx83UDFhI6yfQxxzmHQcD5dXCsHfFY6IscPvUZeoyxBKIXIK4hXri7NX8tJdF08NxcabEBpzBNcGnz57kQZDUm88jp7+1XrXqcyGJ+G+1vH4f+AYnIo+iexF+L3H90I2YU7XGy0zCO+sQ1rWledf3UT6SbF+f1HV2qiU4amr/7fahYQlCdd5Xc9JOkLppahLFpS6cHXqQGG4TKCPC0y/UVNILGrcYaud2fro4E7EJ0OegRIRD5GeRIuAAaJbT8znLHn2tces4PyFXqYaSgtSjYIarhoj4dASSPquMD/IWCcjgmdxfIZF8GNaJHgwHdRukie4M1Z3hHE+uieiKDxAgOEj/XC2xTJQN+w5SXqXVcbEXYHU3pObZzggSplsclWSJoTFzy2OAfMp01DP2jbE3ONcMcqIYgjphGQsr2NHrWOpAl5QBw3Ny5p4juCjX27fii9s+kQqiD5n8mro41Tj/3/a9i1Ws5d+bwXx",
     "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 d35053c4..5b58a1aa 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:U1RSTQE0x7ciXR3xo3FNGei9HWrEjpdDMfMeXGcwsjyMZLPpZjWgO/k="
+    "password": "ENC:v1:U1RSTQGSSO19hwCts/te0jiXecc/yqEtjX3d/AZxdBpV0dQ3ArgmBJo="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"