diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613803.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613803.json
new file mode 100644
index 00000000..4c953b21
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613803.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEIyWGhSxYI4wjvBZ8e6LS/SsV5VWErSI2B0muZmlH/rAe+"
+  },
+  "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_1786613803.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613803.json
new file mode 100644
index 00000000..87cfc770
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613803.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFLQYcsm2MPE3fE3IHPMc5klcqHiOx8HtFvhfhO2esrcuQ5JyT2fkDJ5KQT8JoVOGsOiLmNM9zvqzas8WYTFCSHIWptTqdhP+ALdnkk2dLc2zQ8VLPx9/xSfzBiRJ86pZUgJsEJI4cscpZbSDp4pM7IQAXN+j82sgf83Z5CdpuQkeF5qINn7aqH+hLHLqqGLtg6LXYCUoP+Tw9M5t2sFC9LnGkwti1vAPPR2yeXQpYyTvbh2KlpeXgSriw+DCgGnH7OhEJT22SY3dg9wmhAiaKqKkTXRag+8hwC0+16T23keFmqfHEJlaB7f/8yyFHI0a6VaAV4bIoYXkTvVd6Du3tE/UYwEW0zAoqIss7s1D5PO/ND8KznD9hrVOQF6aQ8CGPRCnT3WFMPtfePqjlyYVMnZ92SbhK1xMxbWlw3yNt/GRzbFJemkP0GD9WnH7Nb4tfZaCdy8adS+sSOR06ctkaWMvtHF0Y9g93MJwQ6mXzE8msgir/MP7L60v3EhkQnFhVWJLIDmJKKOTsrwffv1Z+GnPampckPd3EtXMLnPo+YTIbtt4+/kZYrbPyW3qdB1PDjFaJLOPLe",
+    "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_1786613803.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613803.json
new file mode 100644
index 00000000..e14ac69a
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613803.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQF8NRFqMdSAvpuHABo4PaQbIuhjAxbu/GxWdb1U+yXnZ1F/Ii4="
+  },
+  "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 4c953b21..fb01886e 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:U1RSTQEIyWGhSxYI4wjvBZ8e6LS/SsV5VWErSI2B0muZmlH/rAe+"
+    "password": "ENC:v1:U1RSTQESU51t4Nfb6gMjZHyPj2VvE1bBV5hEJMx2XqFl6ewoYMNz"
   },
   "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 87cfc770..a53933d3 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:U1RSTQFLQYcsm2MPE3fE3IHPMc5klcqHiOx8HtFvhfhO2esrcuQ5JyT2fkDJ5KQT8JoVOGsOiLmNM9zvqzas8WYTFCSHIWptTqdhP+ALdnkk2dLc2zQ8VLPx9/xSfzBiRJ86pZUgJsEJI4cscpZbSDp4pM7IQAXN+j82sgf83Z5CdpuQkeF5qINn7aqH+hLHLqqGLtg6LXYCUoP+Tw9M5t2sFC9LnGkwti1vAPPR2yeXQpYyTvbh2KlpeXgSriw+DCgGnH7OhEJT22SY3dg9wmhAiaKqKkTXRag+8hwC0+16T23keFmqfHEJlaB7f/8yyFHI0a6VaAV4bIoYXkTvVd6Du3tE/UYwEW0zAoqIss7s1D5PO/ND8KznD9hrVOQF6aQ8CGPRCnT3WFMPtfePqjlyYVMnZ92SbhK1xMxbWlw3yNt/GRzbFJemkP0GD9WnH7Nb4tfZaCdy8adS+sSOR06ctkaWMvtHF0Y9g93MJwQ6mXzE8msgir/MP7L60v3EhkQnFhVWJLIDmJKKOTsrwffv1Z+GnPampckPd3EtXMLnPo+YTIbtt4+/kZYrbPyW3qdB1PDjFaJLOPLe",
+    "private_key": "ENC:v1:U1RSTQG4fXI1IL58jEMGEDsO8rDUDN9APUdULPNLx5dgZu2ag8RtQOyFlmm7hSdCr+t5IbXQJINPQo0BvHqLVxhGzXLTMW/CsHc7n8CPnDQjYkQAEUGvb0EWqqPv5O8UtLpnNuo34eRNZWKvRXGnHW+NpNmNF4eyiUIORcm/TdbmXU63MNblbfVmf3tUH5HOC/8ZwKX5Jgbleu6pIEnjEShlzZjwcbJ1OcvoXt56/UFHHTiH30KrQVz6kzwveqtcfiDI2TSV318F/hG5Vn++awzNzh9Pv1i73eEM5rBKZxcQo2jUZfHIMqg3ZuA5vbPuCyMoqJooQxgfq8KYg2MYn4md7n9WO3Vhqtk2RJWP+Oe99CtFbG1QOY4RypUE9SvZ9xG8qtxwoK8e/3YPHiRzI/iTlPSbLg1leUc0ySH5gBzW+QKToQ5AVfkd511G459r92gLHEfK523hLcK1N6n6SFb/AoQxKHNVWLUk7OEcsw8AKDhzhukQYqFk4+m3wkigQyH/Moxl9L5yzPDZUeKMn0Txobvx+rMeShbk0iJp9QigvIW52VA9PJZ0Fy2kKL3Plfsj8eWJJVf0CLik",
     "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 e14ac69a..ebad1823 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:U1RSTQF8NRFqMdSAvpuHABo4PaQbIuhjAxbu/GxWdb1U+yXnZ1F/Ii4="
+    "password": "ENC:v1:U1RSTQEjUQZtY3QyIHoB5Szkt8BThfEBMBbe/Fqm1IM/XPGthuUp2yc="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"