diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786607704.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786607704.json
new file mode 100644
index 00000000..09a4de32
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786607704.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHWnpekRZURWmFG4YVd2XTL+85y2VMQkiXxwtCqr7BArRNe"
+  },
+  "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_1786607704.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786607704.json
new file mode 100644
index 00000000..9868a1b1
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786607704.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQH/evdGsAhEAXjiBRYUXS7lqSw+OTWw99lGUvvuU3zm9Tro1ebrQ1TwKBsUnuhbq5LDRqD4xTC8fnEIVxIMhfbjl7fXi/XuYRHOonR54a6fe3SG6olfuWqAKHulVXt+TzlENcenN2f+9gw1x1SxVxF7/jcJ0DV6W+LkFwQVkP4r4E/UefY9ICclR9jFwr1GDtdNk16+Txh+ZZQ46ZhwsMK0f2m+MLSaVR8V/evBoAU3iO1q718+Wc2N8u+LdtRjI64Jvh9eJ/bXNCkBj0iVwtFYUbUO/KLvobFTgS17wtI1jFPdmeWjUVCxJcGGZPGCecCN18LfU2ln4MAGgs5kgZBaZXgt1lq+oBRw/PNDaloUd3H+sc4cugo2LIdLgGukzh6rsUNfLJWxW0qTxrMs6UMmX0F1uqLqnBmkaSYFYe5lgKbXivC8kafSA69mR6rGnMj/c16STLdJ0FH4zxhPUDvKzmuU/zPMC5njPFjq6n6FtP0CdRthC2E2IGvpLEYkcZskTq8cgkozg8KCI+XoxiddcGFCHKfmVjjkEnL3WOK3EGv0i8v398l+pc+JVOrBnfCM1LPFOl9Q",
+    "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_1786607704.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786607704.json
new file mode 100644
index 00000000..454b6284
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786607704.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFi20iGS+b9XhVO0vVtEIg8gNXZCfe/N/UEdKzf0wYTI7z/HNU="
+  },
+  "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_1786607704.json b/backups/conflicts/sync_meta_conflict_1786607704.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786607704.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 09a4de32..3dde1cc5 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:U1RSTQHWnpekRZURWmFG4YVd2XTL+85y2VMQkiXxwtCqr7BArRNe"
+    "password": "ENC:v1:U1RSTQGwOXcrUInh3Rx18GGBis0RqXxs8Ogb9VCjMO/aN+UJ1lVF"
   },
   "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 9868a1b1..e10cdbe3 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:U1RSTQH/evdGsAhEAXjiBRYUXS7lqSw+OTWw99lGUvvuU3zm9Tro1ebrQ1TwKBsUnuhbq5LDRqD4xTC8fnEIVxIMhfbjl7fXi/XuYRHOonR54a6fe3SG6olfuWqAKHulVXt+TzlENcenN2f+9gw1x1SxVxF7/jcJ0DV6W+LkFwQVkP4r4E/UefY9ICclR9jFwr1GDtdNk16+Txh+ZZQ46ZhwsMK0f2m+MLSaVR8V/evBoAU3iO1q718+Wc2N8u+LdtRjI64Jvh9eJ/bXNCkBj0iVwtFYUbUO/KLvobFTgS17wtI1jFPdmeWjUVCxJcGGZPGCecCN18LfU2ln4MAGgs5kgZBaZXgt1lq+oBRw/PNDaloUd3H+sc4cugo2LIdLgGukzh6rsUNfLJWxW0qTxrMs6UMmX0F1uqLqnBmkaSYFYe5lgKbXivC8kafSA69mR6rGnMj/c16STLdJ0FH4zxhPUDvKzmuU/zPMC5njPFjq6n6FtP0CdRthC2E2IGvpLEYkcZskTq8cgkozg8KCI+XoxiddcGFCHKfmVjjkEnL3WOK3EGv0i8v398l+pc+JVOrBnfCM1LPFOl9Q",
+    "private_key": "ENC:v1:U1RSTQEU3fcmiioa4P9hZfFpg03NqlgyDD4pdxEVaDZvHqu9KYz1Jppzy7zZNYTg5wMlH0Yz6ozzY5i86cA8HB4EJIC+hsnGbaf3TUhh24DPpj1vRkXhWuKGjzlthCfBTHUyCHMfkxTTnbA/lzkFfAIHSXe0bWwNML+0/GWNwqlhCEguWBXDlEHluQqYpsY2Q8bB9szerhTzpSkUdGiJaU7zzZFZulLLW/sv4v8pfRMwfq/yglmIYKl8Zvuy2uf4zEXMNnHwCKWHVCK7aN6uLYIz1EFHGOE318Ak4iT/rjhY9b9u+hdSyUeGzcY4bRHeAORixQGnodq1TW87nTMQhny9cd4qREP3jIj3H2jERBiOzNmaY46tYwndPTaNS3cn94vBPouN6CTU5VBAwk2VNJ99oWlsKHrFAIqgmud9zLzpiwBNGi7tnoojQRzpNcP4JQRBVSwfMc1QPJ+JQEea5fMOX3muJeqTai3CY34TFh+N68P7VfUJ4BsJwo2ofaQ3Nd4dUdj4DqNfJadf+MRgFWf+bA/tTbrO8jYGNb7yKS2Z+z2xapwL3HsN0lXNL3EqtBYtNwDb3TD7Pf2n",
     "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 454b6284..5cc052c0 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:U1RSTQFi20iGS+b9XhVO0vVtEIg8gNXZCfe/N/UEdKzf0wYTI7z/HNU="
+    "password": "ENC:v1:U1RSTQFxyOsczPMAEKZ8lQIm21knD80WiHQ1Pkv5s7cHk809wjOC+Kc="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"