diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612457.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612457.json
new file mode 100644
index 00000000..0fef55a5
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612457.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHOaDSYPa4UpeO4tQ4Z38YPBUYl6lJJXWOwrKPx+qJpkTTf"
+  },
+  "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_1786612457.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612457.json
new file mode 100644
index 00000000..a559ee1a
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612457.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQF0q78svIrGCcIfmTX6UliWLPYwXPclDS//MKnjuwT9B3smwp8Bu8G8NhZyUNjaElI2lZtYpkw9UkcGnyQegkiyCOWUjH6dPeu3EKqMynrt4BVJmnEs/euxmZvjNob5oRxQURNt/AYUGkNzDoFivfU3uFHN5iSJ+LQMM5gCwRE3ZNHYm9luG46AQAYiGNUKQfUtpYmh8VhRiSFjbw3/QoWY+CpMeMRNCGeZsf5yI/IwZSlFC4/GXpQeiFMtV9RqRIiqO1S6tLrOAZ/uTPAqdEO/ktu6T1nr5n7pCvAj2fKAvv6D+Dw6Uetnf2PIyeBfCv6UhpcXVMbkbMPHVJ273rTLhcPBJCE/eZqZlwe2HVEzLTy/TmRGNERrElX3oQOUb3n0XKElCRM+EGQNQZ2Za6E075q5ZHnrAgfyK05MmRtVvSnhupGDYVUvEYV1Nl4GiZ41oCHsu6UHE4LHlmbhn2wFix4Xxd4sfRTarW6J/Mm1+p44oiMuBorYOhATk44raE77LyxIKpFDuI2kMBbCnqNVuW7FSc7x9694ydIgUd4iSiPOCE9YywVyP9R7o0rCCoH0Oi3eEO5Q",
+    "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_1786612457.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612457.json
new file mode 100644
index 00000000..b37e242d
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612457.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGCMF4A/9EFR9PXBRApQhOgV07Ne0vzT5fKGu5dXb1qomtvU3g="
+  },
+  "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 0fef55a5..803aab20 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:U1RSTQHOaDSYPa4UpeO4tQ4Z38YPBUYl6lJJXWOwrKPx+qJpkTTf"
+    "password": "ENC:v1:U1RSTQHpA4tElJa8DVAW+J4sHxix6PwLa/GvTsIshEV4aP97K/hr"
   },
   "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 a559ee1a..1de108a6 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:U1RSTQF0q78svIrGCcIfmTX6UliWLPYwXPclDS//MKnjuwT9B3smwp8Bu8G8NhZyUNjaElI2lZtYpkw9UkcGnyQegkiyCOWUjH6dPeu3EKqMynrt4BVJmnEs/euxmZvjNob5oRxQURNt/AYUGkNzDoFivfU3uFHN5iSJ+LQMM5gCwRE3ZNHYm9luG46AQAYiGNUKQfUtpYmh8VhRiSFjbw3/QoWY+CpMeMRNCGeZsf5yI/IwZSlFC4/GXpQeiFMtV9RqRIiqO1S6tLrOAZ/uTPAqdEO/ktu6T1nr5n7pCvAj2fKAvv6D+Dw6Uetnf2PIyeBfCv6UhpcXVMbkbMPHVJ273rTLhcPBJCE/eZqZlwe2HVEzLTy/TmRGNERrElX3oQOUb3n0XKElCRM+EGQNQZ2Za6E075q5ZHnrAgfyK05MmRtVvSnhupGDYVUvEYV1Nl4GiZ41oCHsu6UHE4LHlmbhn2wFix4Xxd4sfRTarW6J/Mm1+p44oiMuBorYOhATk44raE77LyxIKpFDuI2kMBbCnqNVuW7FSc7x9694ydIgUd4iSiPOCE9YywVyP9R7o0rCCoH0Oi3eEO5Q",
+    "private_key": "ENC:v1:U1RSTQG8vac8PGas0JkT7YRF+iaAoqVmdZTqe0STqFeBzfwoMDczzX0SQiiGnQkYT1I6ciGCJddEO5DEDmozCeAuKZclwaNbxSGGsnaKp1PPd0hJuoCzf/lVRoBdDyCShW3a+7O0t28qDxwQoAcLZTZm5MjtF8qMZQ8/LwWQDQpNTXhaam6SK4g4kqdeN+OZW1+q/F6gTlRFXIubEjmO/1WPKTRvvqs0MxEADjWduKcb1kuq0vLI4w2McUQv8Gtc/irfzVczKmOeeOHVrGdW4Guuv1LPnE7gNt2RFD97O9E55fAJBx2bN/TgpaGI9+2xMLhIUeRHEwHMmedvKdDeEUDM1WRHTqASEGVNuWSFG1u3qJ6jWbBSxNdverSx320xogGFOOuv11gJi2T/pSa3PHkVWlSAIMApgmDte996687ho5y2j5LnvV/ZriwS3PwrD9ld8omtxw8iDO2RVT5gYncsrhHDVyLWSYbjfdVAxjSNTFq/RhuG7Twd2kM6/++bxc6gwvmNy8berm2QrGMOX87hxw1ZCvqMzHbjXb/B0fgt4Z+9B+BEh4hQvpk0zuWUD0zAJYf545n2IGQA",
     "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 b37e242d..f0563cf7 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:U1RSTQGCMF4A/9EFR9PXBRApQhOgV07Ne0vzT5fKGu5dXb1qomtvU3g="
+    "password": "ENC:v1:U1RSTQFCLc7viXb47CXCnuWW+5uG9zW4uuN4uVqc4pHjSlCTGWehg5Y="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"