diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613621.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613621.json
new file mode 100644
index 00000000..fe7bd4fa
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613621.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEXf1qSS08L64AhmqWaQRnUzXYp75YRCGFeHMDXYiKLHab9"
+  },
+  "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_1786613621.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613621.json
new file mode 100644
index 00000000..de637224
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613621.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQGJkRc1i4c58wIL22tlS0al12AzYbvuJF/P/ybeaKLxbbzBAgUU8eltVxC6nYWbscGNQnysNXGsj7yE5T1ZFdmN8J7DSN4miuhSFc15UOeCaxN6u/k7pmhWNYHCoOBRBslpBErhVIFe2Bg8V7+JbVdLwHFp6MdH1HsiO1mofgnYveDFhicKDjUvA6DK4uxU4GX36R0SS4rer9MekitkMOKZzID3KfylO5XYRf9gyWeoWIh6QpjX7gHlay7jXzIXvmWOb/nh0ddqjmTGS+o+gw8gP2+Rr/GDnJrjvYFHEPSe2AEmd1hqlvMrm5MTDgz5onvn9y1xdRmZ/pcqxklgqUY/bEz3mERF3ZTCjsnB39T0qzJNrq9bnj3iGs75Qy+KAa1DAIXoUNdfLMwzDyWshMiCd4BlL53i+oNxJnkocUIzlq0TLEVHkzUfWNTsji4KknsKl5kSNWwMHehxfVxVVyDeI8dUn54JJzQICSXjc1yUlmO+7fgSJbRHofq173ydT3WMq3vYgAzk3//d/AExnvWiijDxbPQDijoAme9bgyefwV9df2B2pchrjG9urVb7M3aTIpUt4mDL",
+    "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_1786613621.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613621.json
new file mode 100644
index 00000000..7202b091
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613621.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHLXWLmpR9+WlZ7atF8k+PWZaVOZUubFX76qkLHjBR01pZzXGQ="
+  },
+  "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 fe7bd4fa..102c1c48 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:U1RSTQEXf1qSS08L64AhmqWaQRnUzXYp75YRCGFeHMDXYiKLHab9"
+    "password": "ENC:v1:U1RSTQEcEaBN1ECK4hQ0EUsUZDOZZ0RECYzsT4l4nR3wemPuPQX2"
   },
   "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 de637224..6ca6a0c7 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:U1RSTQGJkRc1i4c58wIL22tlS0al12AzYbvuJF/P/ybeaKLxbbzBAgUU8eltVxC6nYWbscGNQnysNXGsj7yE5T1ZFdmN8J7DSN4miuhSFc15UOeCaxN6u/k7pmhWNYHCoOBRBslpBErhVIFe2Bg8V7+JbVdLwHFp6MdH1HsiO1mofgnYveDFhicKDjUvA6DK4uxU4GX36R0SS4rer9MekitkMOKZzID3KfylO5XYRf9gyWeoWIh6QpjX7gHlay7jXzIXvmWOb/nh0ddqjmTGS+o+gw8gP2+Rr/GDnJrjvYFHEPSe2AEmd1hqlvMrm5MTDgz5onvn9y1xdRmZ/pcqxklgqUY/bEz3mERF3ZTCjsnB39T0qzJNrq9bnj3iGs75Qy+KAa1DAIXoUNdfLMwzDyWshMiCd4BlL53i+oNxJnkocUIzlq0TLEVHkzUfWNTsji4KknsKl5kSNWwMHehxfVxVVyDeI8dUn54JJzQICSXjc1yUlmO+7fgSJbRHofq173ydT3WMq3vYgAzk3//d/AExnvWiijDxbPQDijoAme9bgyefwV9df2B2pchrjG9urVb7M3aTIpUt4mDL",
+    "private_key": "ENC:v1:U1RSTQGuydhs4UOLl7BKGIZwr6XkezthxVaTJ7/8huFeXOcU9a7Wz1hNuX00Qas5Icxy+By4Zp1LsQj32ElwSVKmf+zFPJkgVYVKTzgKjZsJovWB/Kwj+dXu11KyGImPrj6XHZLBXfq8bcERnliLnP6dVJ10qo2dDUXhf8EEKm/l9zSEN/b+SGdrOp3p8JsNnLdg9pzDNPYEcs+nE7NKHCPkUoPbUfiNH0o1D7RRuR9y7D1P90n1fpYhwIWMwkh5CX5Ixj+SfrboNawFCSQHnw8xoYRvCZAi+ikxdrmNTDO3sKsWDoMEmE7LA+vKJrRv04VjERSPRdqhAlN2WQLwGCKBciuroOkWsvksqz2QEOsX8FFFGuwjJfwOrRvdHLXzZ/lEOOkqaBxbN5EdxrsVO8bHdwPejtti3CiTeqjg9yyqMt1GGHfkvT3OZDSMb199H+i1VMeOAqzT0folsWRNhvVecFy7xoNGy4GGxvyeFHNmSxTDQxnssV+3xf+D0SS8rdzbaXKXKYVwrmQWY0UWlQG03GaH6c2TFp31XikBqULogInXj+IdiWR3VKyF4g3iyF+peNpylJumVFVD",
     "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 7202b091..454abb33 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:U1RSTQHLXWLmpR9+WlZ7atF8k+PWZaVOZUubFX76qkLHjBR01pZzXGQ="
+    "password": "ENC:v1:U1RSTQFAB7wi1Sz2u8c3S80T0wOpJ0OgGXeVig4+GW/G2ahLMnjtYF8="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"