diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611028.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611028.json
new file mode 100644
index 00000000..c45183f2
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611028.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQGDyDhO5DVBfRjD9PYH0FHfgjyU5S8CCMJktwUmi8OCOLVb"
+  },
+  "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_1786611028.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611028.json
new file mode 100644
index 00000000..70d97660
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611028.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQGZIfnj/aloIbHCoBth7jDnPaHIPdvgP4UlcCLgpKWCl5m11Xg7OrXaKLnWfHEjyjcRq6C6ZNYwpViksCkB2RPHHI7pJ9oRp3QBfP8QYDTHTEwevVZE/xSQ2Fp9JxdHEaxUnGfBlcvuo7u072FWWGE/W1STEiMY6KFq/w2sN+gwjYlFGvV4oc/TpVS9WMGKwzRNJkZgfd1u0nAQ0yupSZ4Lu29NRNbrz1byO+4CxrXzTHqY1EwFShk2h/qhgwRPpO0Hg+NH0d9OsIRZ+DPFGZLZt+rrdLzABFJMJgUHi4f1mX5m4ca+Tb1KQ84peAKokLvfdhiY8WoUCuRQqwwIVGjGeu8bxo8icTd0jb9zCO6PqhHRBkQg++DAgi03ya6TYyn1doDbkN73kp6ihIpQsvQFUt0kS3o2q6hYXI917kueZIoX4CRJMBVyfaH+7oPWcX8B4W9m3LbRKW2vGJHMVF+Yiledfl+qzrm+IvWdmCBGkBFfW8XH2LExcjMMaE269lM/2A+CgV/CitHirgA86lFgviau4e1IhNXOonuWV5z/Jq/5Pj9J+8OM7bpImX3PcXRIIBmI8CfO",
+    "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_1786611028.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611028.json
new file mode 100644
index 00000000..569af31e
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611028.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEzlNz/YcMkQ3ooIbVFwn/m6ZJFPfE8toQ1957rc/598DM49dY="
+  },
+  "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_1786611028.json b/backups/conflicts/sync_meta_conflict_1786611028.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786611028.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 c45183f2..0d4b0b89 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:U1RSTQGDyDhO5DVBfRjD9PYH0FHfgjyU5S8CCMJktwUmi8OCOLVb"
+    "password": "ENC:v1:U1RSTQE+vwygDtoSzQhKoqIxuwsNcwv4tkZvyXZzcxf3kj8WpADm"
   },
   "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 70d97660..38ca0a26 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:U1RSTQGZIfnj/aloIbHCoBth7jDnPaHIPdvgP4UlcCLgpKWCl5m11Xg7OrXaKLnWfHEjyjcRq6C6ZNYwpViksCkB2RPHHI7pJ9oRp3QBfP8QYDTHTEwevVZE/xSQ2Fp9JxdHEaxUnGfBlcvuo7u072FWWGE/W1STEiMY6KFq/w2sN+gwjYlFGvV4oc/TpVS9WMGKwzRNJkZgfd1u0nAQ0yupSZ4Lu29NRNbrz1byO+4CxrXzTHqY1EwFShk2h/qhgwRPpO0Hg+NH0d9OsIRZ+DPFGZLZt+rrdLzABFJMJgUHi4f1mX5m4ca+Tb1KQ84peAKokLvfdhiY8WoUCuRQqwwIVGjGeu8bxo8icTd0jb9zCO6PqhHRBkQg++DAgi03ya6TYyn1doDbkN73kp6ihIpQsvQFUt0kS3o2q6hYXI917kueZIoX4CRJMBVyfaH+7oPWcX8B4W9m3LbRKW2vGJHMVF+Yiledfl+qzrm+IvWdmCBGkBFfW8XH2LExcjMMaE269lM/2A+CgV/CitHirgA86lFgviau4e1IhNXOonuWV5z/Jq/5Pj9J+8OM7bpImX3PcXRIIBmI8CfO",
+    "private_key": "ENC:v1:U1RSTQFOXsP1HQCOA7QaQqUpmONzthBi73sQiclo0H0whu2vH3g0Dc9r007M8l7WjKdmBF+1wUzhqto4G973GBzbnKlul5rhGnbTLtD3UgeZCTaZzzq9LJKvYTLrpTPDxwlzs16o0MVw8/wwIxcid64MaKDaGajme0KerVWmWpeJc5wzcn7/btCbh3iVXYJyMS0+BO3mYxfiaDw5jigLWgk/KHcS/u2hQMAge1jrTwcq84SXoNZwypRgHZ3FW4x7qJpbzqxYx9Mcx6E67nPV/k0e+7rdiNLlyTCPHJG67ll2BLMD80tfia/dWHqlvHU8uCmYDSLgB/9jtFGKVhFKf1obsvJQcg++VxJZOqqxIvB9a+HSoyqAdS9ty/Gd5j+U3Bdyn0bLsJFGij+WgZ9RFAfN1Hk/1yKg2msPuTLVMDrFSJXP3HgIN7tPgvm8qug1X6zAS5gy+NhG769Yok5zDoHFBIv271OpttTuii4zg8o0evl/41tetUxzH5hOVhbwO/U7W2vfmmiQhWhsiiUP23aem/zTNrzu0AJ8Vs6e7D11PkDpmYXKNLyYmSByExxYIpnWFfFGw4fK6kSA",
     "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 569af31e..b71ae573 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:U1RSTQEzlNz/YcMkQ3ooIbVFwn/m6ZJFPfE8toQ1957rc/598DM49dY="
+    "password": "ENC:v1:U1RSTQEfCJebAXfjE3UP0yLXZ/ixypSai5QQPFNGN4fqpFJ6CJUemlA="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"