diff --git a/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611688.json b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611688.json
new file mode 100644
index 00000000..5860c033
--- /dev/null
+++ b/backups/conflicts/3487a977-1ff7-4ce3-af79-5643f067cea5_conflict_1786611688.json
@@ -0,0 +1,10 @@
+{
+  "id": "3487a977-1ff7-4ce3-af79-5643f067cea5",
+  "name": "oev-123",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQH4lVQDpwEEF1NOgObnqgCVrZG5u4aALjPyN/rpaf5ylLkG"
+  },
+  "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_1786611688.json b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611688.json
new file mode 100644
index 00000000..32fd8c79
--- /dev/null
+++ b/backups/conflicts/7db2f101-b275-4525-bff3-e09a7a2ffbff_conflict_1786611688.json
@@ -0,0 +1,13 @@
+{
+  "id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "name": "oev-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQEl6uQAD8DkfGmnr2rwv6Wo7HtG0yLcK9PF/9LirXxf6UPNvIYMdhZxEcZwwV+e4lRXcDdSd3h120pL0L42XYG13FxsxYUWjsvI3oSHDymUwPxT3vAJCSQHbzybY6MFM6W5kTEBDHBpPwvRwFWo1KZ3QgW7Uy0bUl/2yLG7LIYkkYiBC3W+1z6bQgaZOpmCA8IfcZwP0uSD47nRmUhb8/MjsKFJ1LtSYrVemokHr3ZcRUD+FaYxzEWbMjguV7bD2a9ZvONsa7G7Slc2ashyGSIGweMuy56+VkO50HTeHnIxKmIB37c1bk4vZQ0509deyqSSFKiFq1K4735PRJ09sjaRAeix94+tvv/Ekt4Xy8C+M8Ocoh+0PkSBVR8NnafXj6+/D199V51AdCfRgeLVgY/tas/DjZhfwvzNrN6Pcl8BNIkv36EwNPAl9eWybbBszBRxQCGVy+cQl+7FZxmNsD+g+kjGpwMcWxVstUlZTmDy1zpMMTEWN4U1SBzAEAvLuVlAt9G7Jsh7BysDcX3m6VIk2IaseUDo0FRFj+7+LwbTWaGhd/rGBilTQWSOla9+4pvvvhoDmzKa",
+    "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_1786611688.json b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611688.json
new file mode 100644
index 00000000..6e2e1630
--- /dev/null
+++ b/backups/conflicts/81915847-1a38-40df-8abf-c80601af2708_conflict_1786611688.json
@@ -0,0 +1,10 @@
+{
+  "id": "81915847-1a38-40df-8abf-c80601af2708",
+  "name": "oev-2025",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQESSEyVlLIOHB0i21/ei2IW1Td48GQZeRJv28RxDfbwQzGdYao="
+  },
+  "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/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json b/identities/3487a977-1ff7-4ce3-af79-5643f067cea5.json
index 5860c033..5ace5106 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:U1RSTQH4lVQDpwEEF1NOgObnqgCVrZG5u4aALjPyN/rpaf5ylLkG"
+    "password": "ENC:v1:U1RSTQE1vCcovRIwkZKwDqLdM3oBxUoC+8FTGDZsyzauODdXWIp4"
   },
   "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 32fd8c79..b0f6cada 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:U1RSTQEl6uQAD8DkfGmnr2rwv6Wo7HtG0yLcK9PF/9LirXxf6UPNvIYMdhZxEcZwwV+e4lRXcDdSd3h120pL0L42XYG13FxsxYUWjsvI3oSHDymUwPxT3vAJCSQHbzybY6MFM6W5kTEBDHBpPwvRwFWo1KZ3QgW7Uy0bUl/2yLG7LIYkkYiBC3W+1z6bQgaZOpmCA8IfcZwP0uSD47nRmUhb8/MjsKFJ1LtSYrVemokHr3ZcRUD+FaYxzEWbMjguV7bD2a9ZvONsa7G7Slc2ashyGSIGweMuy56+VkO50HTeHnIxKmIB37c1bk4vZQ0509deyqSSFKiFq1K4735PRJ09sjaRAeix94+tvv/Ekt4Xy8C+M8Ocoh+0PkSBVR8NnafXj6+/D199V51AdCfRgeLVgY/tas/DjZhfwvzNrN6Pcl8BNIkv36EwNPAl9eWybbBszBRxQCGVy+cQl+7FZxmNsD+g+kjGpwMcWxVstUlZTmDy1zpMMTEWN4U1SBzAEAvLuVlAt9G7Jsh7BysDcX3m6VIk2IaseUDo0FRFj+7+LwbTWaGhd/rGBilTQWSOla9+4pvvvhoDmzKa",
+    "private_key": "ENC:v1:U1RSTQEEqPQXTfiRds1McUlfIZBDwCdG2uQG/an9bZl2naPJEcMWLqo0ughPQLzlv/Ag4hK6Acbp8dR7L1EsebFSsWSqjJLttmv0Qrw8aquWPsoVt+4eICcy78CIamxSrK+fjMgfvNxbF8dhFk+nwqb7lqGE+D99WHi0sflZ/JW7YxPwp/BsGgQXm+QgRuti1NIpF1JAUTUJEW5h30/M++vu/UHlfXpL1AZNtUKoqoFKb2JR9qELo5Mk1gjp/8LbbzxrxAIVgokwyEwvFImr8rAK19vrJvyXcUgldxJCIaAkBrA8NAKSv2N3STktOcKibztOlEmyaAazQynLNKfJhIlArGUp9nEwj958p1jrdVOuuZrHT8+x4ciOrxyWeyF0I0ygIZZHA8g5lqgX9UDpvQqgyYNDqU1dDtMZwb7vvVLRJ87VZEijiC+EqqXH6Bfv2PhqKmbaV/Eg+RzqrHTNqFS1JO3JH5MCxCqywdS8ju5bm1Wdl3I2KYMEw5EiqyYUqrxHKMqLuakP7gJBLz+h22O/4PuwHLH7MHwwvzO/H56e8QwmYxFm+LxulslcAp9BGnItoepuGKrNfpx+",
     "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 6e2e1630..7a647c2f 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:U1RSTQESSEyVlLIOHB0i21/ei2IW1Td48GQZeRJv28RxDfbwQzGdYao="
+    "password": "ENC:v1:U1RSTQEQ0GF09WnvPn2VU5mya98iBOQJ/SKc5ya38fYET+ebE6zA0Ro="
   },
   "created_at": "2026-08-13T04:15:22.425983+00:00",
   "updated_at": "2026-08-13T04:15:22.425983+00:00"