diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616233.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616233.json
new file mode 100644
index 00000000..c4bb32cf
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786616233.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQH+DWCOoxfXZl0ubL+SJfaz0D69waVH2ZRisWhBjq6DS1C4"
+  },
+  "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_1786616233.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616233.json
new file mode 100644
index 00000000..65d6afcb
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786616233.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQHHDiGrhnfHuzinr59wtkL3W6kSJ/BVJkKUAfh8EgtGLv9c4eHsEXk54EdjUBsB9GaHFUIj2UAV9VW9ZmOYI8zwEwBn4js3ysQ4EmPcDtjqrRm/4ACcvdELKKj33yw/77VNlSBGOmjkfsKTAjVgRsFSgWdi46+3mDr6tYv2HJP2NumHsPYG9SCWAV/UeMhr2GnR7r4MxtbhTqUWGb3ikw1TObVY4dDU1yYPb3R7m7n0Zrvrcq7ubgi7/B5oKresdgz81bNXzyzoanSMy0enhgYuCGZMlnj1T9bMuXDLzjdBnp+ucblDJrxA7grU6f31+v75Gphxxmjg6e+i7hssENSzIJlV3gVJ2hBYIl6ELehb9PZ43vNdKq9dhkFSyZRg3D/idXbV1Z1m8aTYikI7r0cYLLhDtbrspZQicWamSAO5Xb/XnROo7q/RdXZw3zxnHdt9yMKyBuIEUmiM1A5MdS5KVMjOHHSlY7pLmkTPoAM1t1Ifhb/FhMHQey/C2f/SrYv02ETR1cUo6PaY+8wDh9/1kxDcSoOwYD6Q0njN2nFlXB0A1mQcgDP6ZcLuelUfPuI1jpruQZWf",
+    "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_1786616233.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616233.json
new file mode 100644
index 00000000..777b8ae8
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786616233.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHEy7/9z3C+xKdeSB/vDnrQXmlin4qH6f3+I5B2Adt4NkbCLq0="
+  },
+  "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 c4bb32cf..cfd45a1e 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:U1RSTQH+DWCOoxfXZl0ubL+SJfaz0D69waVH2ZRisWhBjq6DS1C4"
+    "password": "ENC:v1:U1RSTQGm4P5jQnJ4XuyCz52YcqDMVBNO0KezG5u3NvEyyte2HN2N"
   },
   "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 65d6afcb..467a3f52 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:U1RSTQHHDiGrhnfHuzinr59wtkL3W6kSJ/BVJkKUAfh8EgtGLv9c4eHsEXk54EdjUBsB9GaHFUIj2UAV9VW9ZmOYI8zwEwBn4js3ysQ4EmPcDtjqrRm/4ACcvdELKKj33yw/77VNlSBGOmjkfsKTAjVgRsFSgWdi46+3mDr6tYv2HJP2NumHsPYG9SCWAV/UeMhr2GnR7r4MxtbhTqUWGb3ikw1TObVY4dDU1yYPb3R7m7n0Zrvrcq7ubgi7/B5oKresdgz81bNXzyzoanSMy0enhgYuCGZMlnj1T9bMuXDLzjdBnp+ucblDJrxA7grU6f31+v75Gphxxmjg6e+i7hssENSzIJlV3gVJ2hBYIl6ELehb9PZ43vNdKq9dhkFSyZRg3D/idXbV1Z1m8aTYikI7r0cYLLhDtbrspZQicWamSAO5Xb/XnROo7q/RdXZw3zxnHdt9yMKyBuIEUmiM1A5MdS5KVMjOHHSlY7pLmkTPoAM1t1Ifhb/FhMHQey/C2f/SrYv02ETR1cUo6PaY+8wDh9/1kxDcSoOwYD6Q0njN2nFlXB0A1mQcgDP6ZcLuelUfPuI1jpruQZWf",
+    "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
diff --git a/identities/81915847-1a38-40df-8abf-c80601af2708.json b/identities/81915847-1a38-40df-8abf-c80601af2708.json
index 777b8ae8..97e4cb20 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:U1RSTQHEy7/9z3C+xKdeSB/vDnrQXmlin4qH6f3+I5B2Adt4NkbCLq0="
+    "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"