diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613682.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613682.json
new file mode 100644
index 00000000..102c1c48
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786613682.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEcEaBN1ECK4hQ0EUsUZDOZZ0RECYzsT4l4nR3wemPuPQX2"
+  },
+  "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_1786613682.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613682.json
new file mode 100644
index 00000000..6ca6a0c7
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786613682.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "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
+  },
+  "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_1786613682.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613682.json
new file mode 100644
index 00000000..454abb33
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786613682.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
\ 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 102c1c48..65709b0a 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:U1RSTQEcEaBN1ECK4hQ0EUsUZDOZZ0RECYzsT4l4nR3wemPuPQX2"
+    "password": "ENC:v1:U1RSTQFGkYgZPs7KKvw6RrC/lkrKLKPysgvqwJWsdnE9g44hjGfA"
   },
   "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 6ca6a0c7..3659d687 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:U1RSTQGuydhs4UOLl7BKGIZwr6XkezthxVaTJ7/8huFeXOcU9a7Wz1hNuX00Qas5Icxy+By4Zp1LsQj32ElwSVKmf+zFPJkgVYVKTzgKjZsJovWB/Kwj+dXu11KyGImPrj6XHZLBXfq8bcERnliLnP6dVJ10qo2dDUXhf8EEKm/l9zSEN/b+SGdrOp3p8JsNnLdg9pzDNPYEcs+nE7NKHCPkUoPbUfiNH0o1D7RRuR9y7D1P90n1fpYhwIWMwkh5CX5Ixj+SfrboNawFCSQHnw8xoYRvCZAi+ikxdrmNTDO3sKsWDoMEmE7LA+vKJrRv04VjERSPRdqhAlN2WQLwGCKBciuroOkWsvksqz2QEOsX8FFFGuwjJfwOrRvdHLXzZ/lEOOkqaBxbN5EdxrsVO8bHdwPejtti3CiTeqjg9yyqMt1GGHfkvT3OZDSMb199H+i1VMeOAqzT0folsWRNhvVecFy7xoNGy4GGxvyeFHNmSxTDQxnssV+3xf+D0SS8rdzbaXKXKYVwrmQWY0UWlQG03GaH6c2TFp31XikBqULogInXj+IdiWR3VKyF4g3iyF+peNpylJumVFVD",
+    "private_key": "ENC:v1:U1RSTQFdCQvlmTvcHuY8NZdxZBhCt0TPfvtEmhoqD1slpDvJXqO1Rgs0pZmwZFaqfY4eyNuYDvVqJMGB/Ha2JsbiNlakVdcvTk4KYax9kFPleFIoOgFzDESSpvbVDBFu8L1J2nwTgzDtGquvW89u/xNQ+ZaM6rCnEYJbFMFawMsD7NV1DM7TYAnZBAvhLImLkdmxO6KHc1JLbhFEzJb7yxBI+qg3AJ+AjXj1/9OuLvTkCwlvsCvW8A5TLqU6fADDWiJU41uIqnc14KgnvQd9lzkVzii+SoJZFVhhHQJflIhsX6isF2d69pZMf4dRE16RY6JOhf0w0b62xW1rm8RZOUO1s6liecFhCMq7bUZg/toRi86C1tvYu2TgyM1jZtF0VaKixgfblYStq3p+RuadFELR9PYb45HfMZ9GpMBgtjidmL9Z3bMG4MBepwgSfPwGNj/u84NuzY47GnD4sMcfGdk6WYS2B8yeSQpvjxlv1EeJVvhV7BdpQJ6aivlWEYk9O5pqsYBLZ4ZDJ/eRdwLJBAYJBjHoWV7DAKeUYxTC54h30QbWKkxUdmYn0Lwv7w6ZSAHXy2Gg3o6wuvu+",
     "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 454abb33..a892300d 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:U1RSTQFAB7wi1Sz2u8c3S80T0wOpJ0OgGXeVig4+GW/G2ahLMnjtYF8="
+    "password": "ENC:v1:U1RSTQELAyvgoGmHyX2T1G0he8+u5+KSShpcOZdx+SPeruB/DEdQ8WE="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"