diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616476.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616476.json
new file mode 100644
index 00000000..4a7109e1
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616476.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQESfM+Y3WvZAcy4MiUtH7FyTdzNyr1fgflAHyRoYQ1sa7oj"
+  },
+  "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_1786616476.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616476.json
new file mode 100644
index 00000000..ad381bd7
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616476.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFv92PMve/pX+pgtEmvA2CXKuue6VyIeKUXaBPpatKTfpdO1WYhgFMqlxxW05T1kXHHEtsm7VicpnJxzWomrBRwpPM3Q6+jRVK4hh8CLX5e/9HkLDzJzt1jXKVseEJNwjfSFX6UBnUCgyq0Bpon5+3Es5Gs/Ge1WkB6Dx8fxPFByOSh7nJmBABOTX5AJ7UWiDUaaWkSabV1MjN3TwPVImNnIYi0UeT0JlgY4NRHkIGAT8SORUPapl/6TBTGKJJB+VJJLR4dGsE62CuOVNTiILMxJ7habBFualOkLpf5/m0aQn+lM4DSAh9hJSLFjnVGDiSS4Bq1ZBRywknDV0OAgbYUhzB7Q6PmbIafXFVU7kFgycMQ4FPBee88+orvT7xE96sBoY+cSF774la0JUoJXqRaOFAVUGUsFBz538rntQBx01g/VEySvus0M5lK3CqxpTaF/i1WzJBGN+8a3VqXp5PzSVDPtdx0JXbNA1CAeJi1oNpwgVFwzBP1e5GqMuJ70GqHHAxA5OkqLJ5Xo4adIeGAscYUfQ9NZUx0aARSlop5zbc5t/XtpTzlVt8ztxlXcq5OOZedIq5k",
+    "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_1786616476.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616476.json
new file mode 100644
index 00000000..7ce36c61
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616476.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGD5K7PKeMfdQZiZV4AGQpNWS1n9m2q+O67oLswqSC6rCs8k7w="
+  },
+  "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 4a7109e1..29a40dd7 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:U1RSTQESfM+Y3WvZAcy4MiUtH7FyTdzNyr1fgflAHyRoYQ1sa7oj"
+    "password": "ENC:v1:U1RSTQG8McwpK9XRkgLLPHv3geJDjs4meqe0tflH6JyZvpxyeTTo"
   },
   "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 ad381bd7..171b0c61 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:U1RSTQFv92PMve/pX+pgtEmvA2CXKuue6VyIeKUXaBPpatKTfpdO1WYhgFMqlxxW05T1kXHHEtsm7VicpnJxzWomrBRwpPM3Q6+jRVK4hh8CLX5e/9HkLDzJzt1jXKVseEJNwjfSFX6UBnUCgyq0Bpon5+3Es5Gs/Ge1WkB6Dx8fxPFByOSh7nJmBABOTX5AJ7UWiDUaaWkSabV1MjN3TwPVImNnIYi0UeT0JlgY4NRHkIGAT8SORUPapl/6TBTGKJJB+VJJLR4dGsE62CuOVNTiILMxJ7habBFualOkLpf5/m0aQn+lM4DSAh9hJSLFjnVGDiSS4Bq1ZBRywknDV0OAgbYUhzB7Q6PmbIafXFVU7kFgycMQ4FPBee88+orvT7xE96sBoY+cSF774la0JUoJXqRaOFAVUGUsFBz538rntQBx01g/VEySvus0M5lK3CqxpTaF/i1WzJBGN+8a3VqXp5PzSVDPtdx0JXbNA1CAeJi1oNpwgVFwzBP1e5GqMuJ70GqHHAxA5OkqLJ5Xo4adIeGAscYUfQ9NZUx0aARSlop5zbc5t/XtpTzlVt8ztxlXcq5OOZedIq5k",
+    "private_key": "ENC:v1:U1RSTQH/Dvb6zjoa0klpiTk0vfBNiGdEbI0kUWvS8cHvITV4fmX8swHzkb4DSXFK315eUq5u2J67n2kMI+el5xAoxvMcPF7G510Or49jc090U62LOq9I1PCvAuy0dLGN8dP+/eQ+78tqBeIAdanH/OOgWb3AXfr8fWE8thQwjOOKDWE3eN+HDm2AGiyW/bWHmzvAkd9a5glKUkVujx0Z+65oD2rb7jlOJzAy5SxjitY0ZIOzQIMMxosAN7wqgI3spQ2JgYEDvmkIFlCdpau/WFd8q3vBK+UbWWsUlmziDQqv1ZYrw0o2gm5XdHYVRR/MmcmLrre0TatT3K9bXsXTV/pt3R9X9A7UVawFup1cC5BExM882FJvFE4V0WjWJ5pynGrBUpyBI7wNHO0QNTGXSbNedHVj7wqmiEzDOawWRRHqvmGC+hnnL+wT9SCcqoYyIvJwRZ44SGB288zrA08CEhY/ifWXxVGz3E9EyCT7r3V9TMhYrc7tZnJ/8zLuyvq/sVWqpXoTnS9NE+vgkilv9elLEv0IQ7O4xuUCmCN9k8oMPT2B28V5w9SFtESt24oqYW6eI/gOe3SjaLej",
     "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 7ce36c61..d95d28af 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:U1RSTQGD5K7PKeMfdQZiZV4AGQpNWS1n9m2q+O67oLswqSC6rCs8k7w="
+    "password": "ENC:v1:U1RSTQHvs4tn4ZB8dn4dbDW1wWEU0dCpPq96+ass4ZEcsl4RToXy64U="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"