diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615018.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615018.json
new file mode 100644
index 00000000..b6107424
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786615018.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHBmuVk1zHvm9p/0FPzZgRFVi/sz9mK2CruUjtvPcGz79la"
+  },
+  "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_1786615018.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615018.json
new file mode 100644
index 00000000..79efdf91
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786615018.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEbIksRZArP1gPlIpDsKd9eoEOaYsKZG2n9cwEi7cmWlKDgKQihA5ppLak1nSQ+Bt86rxh8EWKhQHFC2jgrOoyOoLW3LBqIIZyKaiCuTsUXhBTiJC37Ex7eaGPJuzrpbWR57/p52IdG3MR+9kdxcwbzu/LxCk0V18itt3jbOOrgzW1qervvYu+e/i5BKq3mp0XMdQlgPbsNLNFVS0xTb4O1goXdgyOLxVf9kb0CBTyuy4+IwywGBs/l3iyqKKxfo4JLGoqXlH7NAatP4IeEeApSwz4eKzn6DgE1Wb1OFupTNCvOrXVti05o/KUHNyYPNbv+PcpBOzJ30g9n8q5tYgZ/rl8t6aqVaBgS17+Dt68MKSTDo2x4M/00DUclhi3PUKo4Ou3CRE4tjld16pt8Sep8ZL7v94KoEm99tp4VBEwSLZclODW4A/LZA1OdiozVeWZBPJ1QpaxyGI2sOT1VLKxsv9MORhFPLHmWZLrAWO1lH78mSzISCVM7qSccePeIV1QNPNVSeWXSw2y53kXpwx3EgjC1EcH7K1sjfHxt45WoNcsULsrBM5qT84JyuRWr8rC5So0Khz/a",
+    "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_1786615018.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615018.json
new file mode 100644
index 00000000..783979f0
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786615018.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHIkKknfQ/K0KzHu4J8bX1117iO+68fRwGqoq+PDOGB7pWevys="
+  },
+  "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 b6107424..9242612e 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:U1RSTQHBmuVk1zHvm9p/0FPzZgRFVi/sz9mK2CruUjtvPcGz79la"
+    "password": "ENC:v1:U1RSTQH19aKuSc0WokktJQLBD/+ugIodYTTsV7J+d8V8cjcvMSOZ"
   },
   "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 79efdf91..4a040785 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:U1RSTQEbIksRZArP1gPlIpDsKd9eoEOaYsKZG2n9cwEi7cmWlKDgKQihA5ppLak1nSQ+Bt86rxh8EWKhQHFC2jgrOoyOoLW3LBqIIZyKaiCuTsUXhBTiJC37Ex7eaGPJuzrpbWR57/p52IdG3MR+9kdxcwbzu/LxCk0V18itt3jbOOrgzW1qervvYu+e/i5BKq3mp0XMdQlgPbsNLNFVS0xTb4O1goXdgyOLxVf9kb0CBTyuy4+IwywGBs/l3iyqKKxfo4JLGoqXlH7NAatP4IeEeApSwz4eKzn6DgE1Wb1OFupTNCvOrXVti05o/KUHNyYPNbv+PcpBOzJ30g9n8q5tYgZ/rl8t6aqVaBgS17+Dt68MKSTDo2x4M/00DUclhi3PUKo4Ou3CRE4tjld16pt8Sep8ZL7v94KoEm99tp4VBEwSLZclODW4A/LZA1OdiozVeWZBPJ1QpaxyGI2sOT1VLKxsv9MORhFPLHmWZLrAWO1lH78mSzISCVM7qSccePeIV1QNPNVSeWXSw2y53kXpwx3EgjC1EcH7K1sjfHxt45WoNcsULsrBM5qT84JyuRWr8rC5So0Khz/a",
+    "private_key": "ENC:v1:U1RSTQHGGdsP/4qYD5o1jFlAP7vR2dTBSdwjRTy8xzSzIv2PYzQ0XDT880MqtbMOQ/ZJeBhVJWElAGRisgpfvRXVy4BIe9e721PfReo8AOVoTBdeyZZ8VmLnoX9zUWBX3+vKZbMstBEiw/ohpUGZdDEai05KCpxt6EbJoiN3SWU/ss7X2IUhA/jJ5dUke5XIZjT2or9oMq1qZTzwvHMmJhGkHh5nVEsYs3YZo+GmlCrHkkaWSXmAUY2gm3KwRLWcRPlnJFlTimJAFJPRknHQrQCLzXjdUK5Gzeq6gUuZy3EcV9Yz2SSfrIdwpAoI6gapWBgr529D/Req3tp/c9qQ84pqGNMwOMKi3a/xVkoyMQQX+mefYaS9utPQ59C2LOpP6Bo8wLpkPqJ83oHUN/3pA9Xyp2vz1cDyhWq9/B8iaejZTdoM8OlmwDMVPszfjju+k9nV0mxHaQmtCgVb1GKBTIyyyZINZrXH2C9+sXJrdcjC/IlVJ/z8xyK/A8AVcDBw3JuB701PgUk/z9JFhyKzRxLiepsXCcxYbbuheo2GTKTulCoOgsFh5dCuAf4l2G03RpdilHiyD1q4ufWb",
     "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 783979f0..62f00573 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:U1RSTQHIkKknfQ/K0KzHu4J8bX1117iO+68fRwGqoq+PDOGB7pWevys="
+    "password": "ENC:v1:U1RSTQHdpRka+ayTd9PCcwRQJc22rKDVrOAqkt4+VfpAqUaDefMuCso="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"