diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609517.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609517.json
new file mode 100644
index 00000000..49fc2483
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609517.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHsE8k8hpDAk/AL7nYhf/xe57MOLHNASS2IGla0OO/nU9fy"
+  },
+  "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_1786609517.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786609517.json
new file mode 100644
index 00000000..1f18e264
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786609517.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQFahvW35IB5C00YPx5aj1/gqS80Qh58qwzhxVGBVvDhzHd9tH7UOxPDVaI9+kHXy3s9PAI5OFQKucR+yGtNnSwmhuR15jn4euxKEIHWJe2jOGqNMeOhXI16Spw4twP2P5r+HedjiwmMSPln+dgyJQtu/88FTnq+p+fbMOcz6Elm4ItDBwDK1ImPmz6RZHMDXJ+qOFrmsos5wqEcc+XCSyODzARK/jz21f9yfaS/6iDe1aalnHrb65/2jHr23ih6VwutTamLsXvChEtEwy2k+uVqquJnRy2QkQ1hBahNJDxoo93K5pTRCHfa3VhlG3fm6NLq6yzfUl/A9F0O02gOl1iyYwGhdjL4rgU0LrYmt7JxDcZxih+PiUD0pLmGyAnLJrWrfddWNVVGDShUZEoCAuHP4U9FewCLyZHt+zR5Njje8DxbsWut8UJf4dhogrfVbA3JvoGeA1lLa7Oko2CgpbCv94RgQDzth9mEZHDf/8k5V05clzw3EivrKoCx5Nq9YaOyEyq6yIEb6l6Abwa3Ea9vY3NRqbFbbD1vh7g6oEr+y0lw74j6bZ1BKmVytBVQznmY6oitjYWA",
+    "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_1786609517.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786609517.json
new file mode 100644
index 00000000..5d749689
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786609517.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEEctaX9IgCimwU8mQpDiFePP+DesjNGdoLDcw/H+cWuF/oaMg="
+  },
+  "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/backups/conflicts/sync_meta_conflict_1786609517.json b/backups/conflicts/sync_meta_conflict_1786609517.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786609517.json
@@ -0,0 +1,3 @@
+{
+  "version": 1
+}
\ 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 49fc2483..d5be9d07 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:U1RSTQHsE8k8hpDAk/AL7nYhf/xe57MOLHNASS2IGla0OO/nU9fy"
+    "password": "ENC:v1:U1RSTQEWMrWfSavewmvArscU0ghcrSNvi+lztXb8nZ9tTXgKs41k"
   },
   "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 1f18e264..e8eb4b96 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:U1RSTQFahvW35IB5C00YPx5aj1/gqS80Qh58qwzhxVGBVvDhzHd9tH7UOxPDVaI9+kHXy3s9PAI5OFQKucR+yGtNnSwmhuR15jn4euxKEIHWJe2jOGqNMeOhXI16Spw4twP2P5r+HedjiwmMSPln+dgyJQtu/88FTnq+p+fbMOcz6Elm4ItDBwDK1ImPmz6RZHMDXJ+qOFrmsos5wqEcc+XCSyODzARK/jz21f9yfaS/6iDe1aalnHrb65/2jHr23ih6VwutTamLsXvChEtEwy2k+uVqquJnRy2QkQ1hBahNJDxoo93K5pTRCHfa3VhlG3fm6NLq6yzfUl/A9F0O02gOl1iyYwGhdjL4rgU0LrYmt7JxDcZxih+PiUD0pLmGyAnLJrWrfddWNVVGDShUZEoCAuHP4U9FewCLyZHt+zR5Njje8DxbsWut8UJf4dhogrfVbA3JvoGeA1lLa7Oko2CgpbCv94RgQDzth9mEZHDf/8k5V05clzw3EivrKoCx5Nq9YaOyEyq6yIEb6l6Abwa3Ea9vY3NRqbFbbD1vh7g6oEr+y0lw74j6bZ1BKmVytBVQznmY6oitjYWA",
+    "private_key": "ENC:v1:U1RSTQFS3TZTZ4VSoeXgVXfnwugpS+X5qecrkIcm9bFjJ30nvuCMzfQpuPY9Z2XqibZYwY/UBOpZGdBu9GJAo9KU9E0JQ2zfZnD3o0VbPtmAl3XAkC1+W0SBlHsQUcXf/6NLQ23CjiElSgMHiCKEVOd6i4ugUXiIoqtLllrwJyIFBurtos9qbiVn2z0Nazlg8R9M5ZlHAAIytqkBIXQQaZorE35f0Z2plqIqpqnrPyR9iHXgK4DKDJJH7hvEzGegH/gL8cNJmSLeaIzKlOEH2i8E3Hz0riKVAffKNwIc9hnNSr2Lnil0d9YtjskLSY1ccPrQvGS/q0jht0XPCTBqTzPVlYuqbSFAwfJda87dSyFfQ2mVY7yCkKLGlbRUJYt5x00S2SJhbraxYkZJXWUnppEcPl7ojvHwk52HHPbrUVYAo+m0BJ/AJFf23eWEyV82GEddaZJ16x090MUFIkKqmTVfiYRut0pushi2z7ExcGC85MdlCka5sbA6CQa2tG/X98EMDHrmEx527IISsrLpAWSl7jOaxkgLZPEltW/PGqYcIlh5ZHUZYfxMCpoCBrd759hZCeb5yWuKalDo",
     "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 5d749689..cb9d745c 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:U1RSTQEEctaX9IgCimwU8mQpDiFePP+DesjNGdoLDcw/H+cWuF/oaMg="
+    "password": "ENC:v1:U1RSTQGp0JftlrxELSxnFEkIxEKdtDIKNutAOKwazB73rc7lZxvo+QI="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"