diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612396.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612396.json
new file mode 100644
index 00000000..190c4e72
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786612396.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGLvleb19SyPHFuyxAYPHhs3WaD4QyEBMRFXSF++Xu683tq"
+  },
+  "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_1786612396.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612396.json
new file mode 100644
index 00000000..29a72769
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786612396.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEF3RFqlt6bkHgQLf0DnofETDxuKTfBw/blEPKlynrVX612O0fjKbsWhQ0wHvKWzCdEQN8gv7d47kZZEdGBPbSy3Andd657WFLIbVakaFpzPjAfeJP5aLAgW5K5ZEwA8kOXYIML+yYpkABeHxOEEkGHb4SBuxH8rvCkzgCkIPljvjr7Atk3ISOQhk5lqS4rQEaQrDJ25L7pMcBujRE4HOflHBeqbRDygxWAhZuKRUZPdmjGZxIo0N5fKR4dy94nbSMFw6syfaU2QgaPinDGn78qTjAdIz5Iuak4e8VyTn1cdPx3RKAfxXoGWDeAvlWK+cWHoSoYnn1rYzKjMT4QkfZU10K/KIIA+Um5oP24meKGSiKEC550gcUWTBybJK+Wn79IOJI2ZrpzN7USeV1rHSTCuLb53U7A5hNijw1E0GevwzI4cXz55IomJeXnYwDBVet03D8FL/BA8V1fqHBhV+8wrvQWtYHtkvC2Zx8klKxIYTxYEMRp40EmTexasZHS5PrcpfJ+mDNoOpECmPpz5r+b9FQp7NPt82C5U3HKLKFs8aCBsZs83IN/80OeLf8CF1/10o+Fzm8D",
+    "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_1786612396.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612396.json
new file mode 100644
index 00000000..111adee7
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786612396.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGYemAnzWI8gegfZfm6dPqWRQjGk2P9BWlmjh1ctvjjcKLAM6Y="
+  },
+  "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 190c4e72..0fef55a5 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:U1RSTQGLvleb19SyPHFuyxAYPHhs3WaD4QyEBMRFXSF++Xu683tq"
+    "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"
diff --git a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
index 29a72769..a559ee1a 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:U1RSTQEF3RFqlt6bkHgQLf0DnofETDxuKTfBw/blEPKlynrVX612O0fjKbsWhQ0wHvKWzCdEQN8gv7d47kZZEdGBPbSy3Andd657WFLIbVakaFpzPjAfeJP5aLAgW5K5ZEwA8kOXYIML+yYpkABeHxOEEkGHb4SBuxH8rvCkzgCkIPljvjr7Atk3ISOQhk5lqS4rQEaQrDJ25L7pMcBujRE4HOflHBeqbRDygxWAhZuKRUZPdmjGZxIo0N5fKR4dy94nbSMFw6syfaU2QgaPinDGn78qTjAdIz5Iuak4e8VyTn1cdPx3RKAfxXoGWDeAvlWK+cWHoSoYnn1rYzKjMT4QkfZU10K/KIIA+Um5oP24meKGSiKEC550gcUWTBybJK+Wn79IOJI2ZrpzN7USeV1rHSTCuLb53U7A5hNijw1E0GevwzI4cXz55IomJeXnYwDBVet03D8FL/BA8V1fqHBhV+8wrvQWtYHtkvC2Zx8klKxIYTxYEMRp40EmTexasZHS5PrcpfJ+mDNoOpECmPpz5r+b9FQp7NPt82C5U3HKLKFs8aCBsZs83IN/80OeLf8CF1/10o+Fzm8D",
+    "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
diff --git a/identities/81915847-1a38-40df-8abf-c80601af2708.json b/identities/81915847-1a38-40df-8abf-c80601af2708.json
index 111adee7..b37e242d 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:U1RSTQGYemAnzWI8gegfZfm6dPqWRQjGk2P9BWlmjh1ctvjjcKLAM6Y="
+    "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"