diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608913.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608913.json
new file mode 100644
index 00000000..84014ab6
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786608913.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQF0uEweiHhtcR1/u9NuCyWfJig/qHgPmRoyBS/vdgYbSaag"
+  },
+  "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_1786608913.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786608913.json
new file mode 100644
index 00000000..06aea6e9
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786608913.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQF8t01CYLul6T1ZYpH0UgtwCe1pS4qSKdednAZY6We5/WVPZNzISeoMd4NzK96ZqdC7mBfFa2RctpXWXNZk28qS8RFOcM/GKR2VU7Cwt3ImTtUxF4Y9BtGqkzLAM+4lhTedlurmJOGagc6EOaIhoPQXwgsvwmw2yB54BHKVoCfJer36ZXprj3WnWbRX3vfz+HfibKl2fAw2W8+d0gqqoEjSoRhacTVn9G8hjj9bYPX6mdeB+grLXVvgqRIbxAWl6+E/XPlhkaWtoIH48XhVzyc5poewbEIHXIUmilVxnjCSEQl1wzzlLFE+ovr/lfWijhkqCcZoUZhD47oeUWYPeQ2x/mSNyEVKTYXQ/5LwuKePaLoxYoBLZWaVxSbvREIQXy723OSpld5YBrK2vdXC24YcMfBg9JOI39FaLqyJX+x6QHcWpkyN+VT/Xy9WF0T4gYEojp0APzIiwfPVybtpHlBPdTDpv0faGSLRpX6mwzWQhQaUyGnHKrBWumNCyTELvoT5pDV5i3OT6nKDzQOtWPVZ1WKMyfoh3bcQ2s3IT5FIFqkZFcHByAFJMOIHhygBjyNnemFYAqhC",
+    "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_1786608913.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786608913.json
new file mode 100644
index 00000000..a2473ae6
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786608913.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQHzzJaCogCaDqkEFbyP0GN5E96a+475mw8i2A9+OWMGqZsavOA="
+  },
+  "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_1786608913.json b/backups/conflicts/sync_meta_conflict_1786608913.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786608913.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 84014ab6..a1d2afea 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:U1RSTQF0uEweiHhtcR1/u9NuCyWfJig/qHgPmRoyBS/vdgYbSaag"
+    "password": "ENC:v1:U1RSTQGH4G0oCAdhrRXxBuYNWMS8jr8WQ6ndesFGAW7DW+5TsUVR"
   },
   "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 06aea6e9..53c58a99 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:U1RSTQF8t01CYLul6T1ZYpH0UgtwCe1pS4qSKdednAZY6We5/WVPZNzISeoMd4NzK96ZqdC7mBfFa2RctpXWXNZk28qS8RFOcM/GKR2VU7Cwt3ImTtUxF4Y9BtGqkzLAM+4lhTedlurmJOGagc6EOaIhoPQXwgsvwmw2yB54BHKVoCfJer36ZXprj3WnWbRX3vfz+HfibKl2fAw2W8+d0gqqoEjSoRhacTVn9G8hjj9bYPX6mdeB+grLXVvgqRIbxAWl6+E/XPlhkaWtoIH48XhVzyc5poewbEIHXIUmilVxnjCSEQl1wzzlLFE+ovr/lfWijhkqCcZoUZhD47oeUWYPeQ2x/mSNyEVKTYXQ/5LwuKePaLoxYoBLZWaVxSbvREIQXy723OSpld5YBrK2vdXC24YcMfBg9JOI39FaLqyJX+x6QHcWpkyN+VT/Xy9WF0T4gYEojp0APzIiwfPVybtpHlBPdTDpv0faGSLRpX6mwzWQhQaUyGnHKrBWumNCyTELvoT5pDV5i3OT6nKDzQOtWPVZ1WKMyfoh3bcQ2s3IT5FIFqkZFcHByAFJMOIHhygBjyNnemFYAqhC",
+    "private_key": "ENC:v1:U1RSTQEpkKR94U1qLBrz4DepItY+REGqoH51NYkaPgfqEho7eU/DRNd/DfP3XyU2QxvpXer8uf77DTY2qKgUmi8VPskK24ppzoaM3gnxLzhILtIgiN4dTUwX2Xxf2BHfrHDRbzd4JY9Xx2X/WuqXy8e6GloMF7Ct02fxerY7Yku9dUstRKC1kWO21drGx2crROow0ORgzaBBpR7NdazrWWOjj8ZLWubdF63GLbK8qNe96a4NaynWyys0kp6tRobRfr/4BeGPzQ9ULPUVVakR1EJOOjgPBYj04uA1D4rf5C4zKae3aP2bO5dbylBure9EW/DTW+NHi/WY/u0WEhBm6kYlf9zTvdIG4kcWD2AM7PMUSzXWz5Q07i6iMuzBCVzRGi74RetcPfHk9kQ6M4S2i6zTskSCqgBkBx+9EFqSuV28YN7L8ipowx5Y8yYJPRXTAgLkpr9ORVBvvwHzWdghZb8M8a56+bZo9CdcGFwOCMM7TZJujBBe/MCRjLa1BvuoPisRoAOAnrFDbg0YtMxDQs0Gz+so7boUlhpD0EBB+sWQrHBJP+GgFC4SsApe5nRoKEp0h3g5uO13Mpyn",
     "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 a2473ae6..3cf35b18 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:U1RSTQHzzJaCogCaDqkEFbyP0GN5E96a+475mw8i2A9+OWMGqZsavOA="
+    "password": "ENC:v1:U1RSTQEStAi2HIDseOx9gyRK0216fSqQ9etomIyM8i2LHCHPvT0o8jo="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"