diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616294.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616294.json
new file mode 100644
index 00000000..cfd45a1e
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616294.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGm4P5jQnJ4XuyCz52YcqDMVBNO0KezG5u3NvEyyte2HN2N"
+  },
+  "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_1786616294.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616294.json
new file mode 100644
index 00000000..467a3f52
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616294.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEQt0+ui8P6e06E6JSXKaKHyS5P9YYf1p4ltROqYz9BR7jw/PIujl8aKyivR0aGTRINX3A4ZKCLEbsXXU+bkPe/qoCLXhqvCG8IlXghpapxA09jpHtbDhkHtJhJSEJeudPIWJJpDX9+x8gxjFjz6+uwcweFQACNKRBfPl+DRUxa/Lk/VyqYKOy+kGMOwZoSxhvParppaI49KNvHA1nmikas+Zabn6WpHswfbX3a9P0i+xU22MPrQcj3rkdBzXQFXqO4Y2VYzFEIsGLwQ6XSZzZjQb/4aVSF19BT3QGReLVVzGqkd4/jH8Z+OVotq3XvWg41ThrHT02a2pmv5J/BeA4XezMd0UjnAt3659OyuWiDoY+Bne5+vmvU9P/DczRrdxe+RIa324fKKGyDvGDYJHvTpxWOtlf+VCbt++5topPT1HR2YncCB3DCYufMYxWIkYH+u1R7QA+MNeddYqMGThtW73DVFI1Q4IkGjrhroKtXgrZUqCtll2iYvsCEonurLSC5U4pgRtJpHBFXTU9CW9C5oGDAJLmZUQxNdWQe3P5VYs4cs5+qsIQxInkfX8Cu83aLOJIcJdtl",
+    "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_1786616294.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616294.json
new file mode 100644
index 00000000..97e4cb20
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616294.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEc3x8WeB8+6LC6g0jss7duRgalCBeKUQBUOBqACpHFUWvn57k="
+  },
+  "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 cfd45a1e..9cfcf62d 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:U1RSTQGm4P5jQnJ4XuyCz52YcqDMVBNO0KezG5u3NvEyyte2HN2N"
+    "password": "ENC:v1:U1RSTQGSmQMwpayk7G+zigIfPW87dlOW9m4HTxs30X7ad+HSumYl"
   },
   "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 467a3f52..a0e2c9db 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:U1RSTQEQt0+ui8P6e06E6JSXKaKHyS5P9YYf1p4ltROqYz9BR7jw/PIujl8aKyivR0aGTRINX3A4ZKCLEbsXXU+bkPe/qoCLXhqvCG8IlXghpapxA09jpHtbDhkHtJhJSEJeudPIWJJpDX9+x8gxjFjz6+uwcweFQACNKRBfPl+DRUxa/Lk/VyqYKOy+kGMOwZoSxhvParppaI49KNvHA1nmikas+Zabn6WpHswfbX3a9P0i+xU22MPrQcj3rkdBzXQFXqO4Y2VYzFEIsGLwQ6XSZzZjQb/4aVSF19BT3QGReLVVzGqkd4/jH8Z+OVotq3XvWg41ThrHT02a2pmv5J/BeA4XezMd0UjnAt3659OyuWiDoY+Bne5+vmvU9P/DczRrdxe+RIa324fKKGyDvGDYJHvTpxWOtlf+VCbt++5topPT1HR2YncCB3DCYufMYxWIkYH+u1R7QA+MNeddYqMGThtW73DVFI1Q4IkGjrhroKtXgrZUqCtll2iYvsCEonurLSC5U4pgRtJpHBFXTU9CW9C5oGDAJLmZUQxNdWQe3P5VYs4cs5+qsIQxInkfX8Cu83aLOJIcJdtl",
+    "private_key": "ENC:v1:U1RSTQHRJ1QSmVmvTeauckpLS2wTTdKZ3ciCfOOK7pY65A+LM6prjvjt422gvoCFRRIvAyM8rgNOf69Jc6IWVNV+B7GFWbGAbq2iNh8fsFAdUIxHlPIJdnRuEBnSOA0EJE72ksK55oDiJrBTif6yAP/yQPuKYNuhDGeRssRmpX0SLzjvEskhBadlH6pPMAacfntBHaNWE3yO8OBDDEAnjD5XWCttqA7GtjmRRvjU2HXI7aFkG4cElwCoCVHfyNKHQbpHoDzP+zC8aC18Kfp3Kc6FmZv+xjZZq/XMuSiXSUKELVJRIbXtLe2nWTrXlR2mbrE5xlPK0LLoQ08tlWnYmVj8znEI/DsKucAMXBMjuPOOWOameKC+fREq4fXR+w18CaZOZckn4ZuhwPkUEus5ihuFVRb5sepPLZe9HvjCGwbRcFq8Zu1xr7Z9lAaISDyCendhsO873/cnRkf5gbwZhOaXVDVuehTEjpfMwifnm0VX6C2ZJtzijXIw3nBQ0a+NRLXNtbupfgBKaI4xR+lqbRBFaa39dXP/5qvAl19gia0A4nlNnd+piwF2e41j6YrXYLMAG3twogNZvWhl",
     "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 97e4cb20..36cb53bb 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:U1RSTQEc3x8WeB8+6LC6g0jss7duRgalCBeKUQBUOBqACpHFUWvn57k="
+    "password": "ENC:v1:U1RSTQGaRdYBcDZYPHr/mg5jepuZT+KAd1Zi21LwmDk46eVWlSZ/IWM="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"