diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609215.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609215.json
new file mode 100644
index 00000000..a1d2afea
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786609215.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "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"
+}
\ No newline at end of file
diff --git a/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786609215.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786609215.json
new file mode 100644
index 00000000..53c58a99
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786609215.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "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
+  },
+  "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_1786609215.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786609215.json
new file mode 100644
index 00000000..3cf35b18
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786609215.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEStAi2HIDseOx9gyRK0216fSqQ9etomIyM8i2LHCHPvT0o8jo="
+  },
+  "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_1786609215.json b/backups/conflicts/sync_meta_conflict_1786609215.json
new file mode 100644
index 00000000..81745113
--- /dev/null
+++ b/backups/conflicts/sync_meta_conflict_1786609215.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 a1d2afea..49fc2483 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:U1RSTQGH4G0oCAdhrRXxBuYNWMS8jr8WQ6ndesFGAW7DW+5TsUVR"
+    "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"
diff --git a/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json b/identities/7db2f101-b275-4525-bff3-e09a7a2ffbff.json
index 53c58a99..1f18e264 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:U1RSTQEpkKR94U1qLBrz4DepItY+REGqoH51NYkaPgfqEho7eU/DRNd/DfP3XyU2QxvpXer8uf77DTY2qKgUmi8VPskK24ppzoaM3gnxLzhILtIgiN4dTUwX2Xxf2BHfrHDRbzd4JY9Xx2X/WuqXy8e6GloMF7Ct02fxerY7Yku9dUstRKC1kWO21drGx2crROow0ORgzaBBpR7NdazrWWOjj8ZLWubdF63GLbK8qNe96a4NaynWyys0kp6tRobRfr/4BeGPzQ9ULPUVVakR1EJOOjgPBYj04uA1D4rf5C4zKae3aP2bO5dbylBure9EW/DTW+NHi/WY/u0WEhBm6kYlf9zTvdIG4kcWD2AM7PMUSzXWz5Q07i6iMuzBCVzRGi74RetcPfHk9kQ6M4S2i6zTskSCqgBkBx+9EFqSuV28YN7L8ipowx5Y8yYJPRXTAgLkpr9ORVBvvwHzWdghZb8M8a56+bZo9CdcGFwOCMM7TZJujBBe/MCRjLa1BvuoPisRoAOAnrFDbg0YtMxDQs0Gz+so7boUlhpD0EBB+sWQrHBJP+GgFC4SsApe5nRoKEp0h3g5uO13Mpyn",
+    "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
diff --git a/identities/81915847-1a38-40df-8abf-c80601af2708.json b/identities/81915847-1a38-40df-8abf-c80601af2708.json
index 3cf35b18..5d749689 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:U1RSTQEStAi2HIDseOx9gyRK0216fSqQ9etomIyM8i2LHCHPvT0o8jo="
+    "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"