diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613071.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613071.json
new file mode 100644
index 00000000..871baf27
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613071.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEi27IJRFxfLUpDhF7Npa+tpjzv+dVua9wJI6mFWOXjgXUw"
+  },
+  "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_1786613071.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613071.json
new file mode 100644
index 00000000..19ae9d13
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613071.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQF9ddKnB+i/dlrovmhfsy6Wz6gpa8SkjcNCZrRbBaeLbhdsgVO8hdTdCIyK+Ku3FTsi2voOVAv4tocnByI39vQyI6QH2ULbGH/wRRYoyu93bspECe95Vi271cHlVDJ6LVcm0aGqwMP+EU49qQMFoqRz0kLzR0V61Mj9HuEM0dQHQfMrlP+rRy0bElK9qRyQinw4kJjTP6uNt/cl4vjg5bFjJPdGEwROggsNQIPWUVeD3S0teFRrv0f0+0ANqqrB01kQsJj0TylZlhQckFqn61eA92Pvrg1bpctz+r0ll0gixEISn2QcdgDuo6R9YuiZ66675g1rcgIS2jVk1L6C++P9d9B8QIwSR2Nydv+dth8P97iE6S4+FPXaQ9LRvfLzpOgj7/kiNR8Ho0jHrTaMkUIWRCN5Rqw+rkN0pR3A9s7NDx/GsJ51NI5wq9Cs3CquxIbVer9PuPUR/iUDeLil/PT9g6tTtL2hygNXd9WIdxGwuXa5fqA+4YmW/xMI5d5tR3X37QXE+j8fACGSqhd6n1OlotiDL7Rk+A28kcuDgyNVdLG69yvzrnE1q1dgXiYckXfszCNQ/2st",
+    "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_1786613071.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613071.json
new file mode 100644
index 00000000..3b10bb38
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613071.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHSfRI6DdnxAuOhMeo6z7Xw9y3qbSEcukuELOM70c5cRlpdX0c="
+  },
+  "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 871baf27..dcf9e6bf 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:U1RSTQEi27IJRFxfLUpDhF7Npa+tpjzv+dVua9wJI6mFWOXjgXUw"
+    "password": "ENC:v1:U1RSTQEVLpB2C+FcTl8x4bV5IX+HxJPt7nQAdCKj6QJ+yEKy9IWa"
   },
   "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 19ae9d13..71694e30 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:U1RSTQF9ddKnB+i/dlrovmhfsy6Wz6gpa8SkjcNCZrRbBaeLbhdsgVO8hdTdCIyK+Ku3FTsi2voOVAv4tocnByI39vQyI6QH2ULbGH/wRRYoyu93bspECe95Vi271cHlVDJ6LVcm0aGqwMP+EU49qQMFoqRz0kLzR0V61Mj9HuEM0dQHQfMrlP+rRy0bElK9qRyQinw4kJjTP6uNt/cl4vjg5bFjJPdGEwROggsNQIPWUVeD3S0teFRrv0f0+0ANqqrB01kQsJj0TylZlhQckFqn61eA92Pvrg1bpctz+r0ll0gixEISn2QcdgDuo6R9YuiZ66675g1rcgIS2jVk1L6C++P9d9B8QIwSR2Nydv+dth8P97iE6S4+FPXaQ9LRvfLzpOgj7/kiNR8Ho0jHrTaMkUIWRCN5Rqw+rkN0pR3A9s7NDx/GsJ51NI5wq9Cs3CquxIbVer9PuPUR/iUDeLil/PT9g6tTtL2hygNXd9WIdxGwuXa5fqA+4YmW/xMI5d5tR3X37QXE+j8fACGSqhd6n1OlotiDL7Rk+A28kcuDgyNVdLG69yvzrnE1q1dgXiYckXfszCNQ/2st",
+    "private_key": "ENC:v1:U1RSTQEmR/cuazrt+XbbzQST0WbZSFWSDpbHEHMiXjBeIuTzHT8Qye4EQXnXkSOzNCsQkPEN0lSIgscgjSK30m3I+ZcOjVI7CYZn+fp1SDQ8kojqKY1EQXi/pyHRU2X7AbuedHSoIhCvBSY8GSnAp8ZmNYnZsgAQcP4j4aMidgSKJV+7fBulnZrLbDaRISvkbpHhAD7uXM5zSEhy5VLR/aIg6UBg9RfSyqaLh6Jyn75pMBgZdMYZnSGDKxz/G6Epw6V9gM5dGtgBrsa62d1pq8M6hLmLWSPSNgG1oOrMOxQtIo3kmbo2YXdQ256ggZOI6NfuC4/r35ox2DqgpsLvMndjZ6gjtw/tM5X2fr+SrhYCxwfXpvshWb2Nj4k6W8FDIvg9HehwWlOCfGTioCjs9+xCc2ZDfyP6GsJL5jURwQ1lG0AZEwbw89bU5fiJXA3Syndfkv2LpvbtwvIRaOqMl+7lsZCcIhFN55/6Lq63CrCYfN86B+HbS0BTBtyfnN6RPLZ3Ru24uWe1/O8yBKaMfzEl9/IQU4GHxAv5TN51kHMyx+3fvbSXQvur6ykhdOefOeJubQ04cHK9UbeB",
     "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 3b10bb38..44ae33bc 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:U1RSTQHSfRI6DdnxAuOhMeo6z7Xw9y3qbSEcukuELOM70c5cRlpdX0c="
+    "password": "ENC:v1:U1RSTQF4sU3ABzqVChELitb+B1XYJTL+ptrQ8zRRlgzLbBwuF9cZ7eM="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"