diff --git a/identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json b/backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685857.json
similarity index 100%
rename from identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
rename to backups/conflicts/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb_conflict_1786685857.json
diff --git a/hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json b/backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685857.json
similarity index 100%
rename from hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json
rename to backups/conflicts/529708d1-7e0e-47b9-bf42-5a15cbfdb145_conflict_1786685857.json
diff --git a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685857.json b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685857.json
new file mode 100644
index 00000000..509c5791
--- /dev/null
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786685857.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQEJjqeNoBXcaej6besvdunuO4E6i0Z5/1GaJIwY9D3fFPIbC4uApVQ="
+  },
+  "created_at": "2026-08-14T05:20:24.759864+00:00",
+  "updated_at": "2026-08-14T05:20:24.759864+00:00"
+}
\ No newline at end of file
diff --git a/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685857.json b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685857.json
new file mode 100644
index 00000000..95885b11
--- /dev/null
+++ b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786685857.json
@@ -0,0 +1,17 @@
+{
+  "id": "cfcc6e2e-666e-4928-9914-dea57e939bf0",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:20:24.764057+00:00",
+  "updated_at": "2026-08-14T05:20:24.764057+00:00"
+}
\ No newline at end of file
diff --git a/hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD_2 b/hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD_2
new file mode 100644
index 00000000..e2167f36
--- /dev/null
+++ b/hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD_2
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
\ No newline at end of file
diff --git a/hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_2 b/hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_2
new file mode 100644
index 00000000..e2167f36
--- /dev/null
+++ b/hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_2
@@ -0,0 +1,17 @@
+{
+  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:29:30.180223+00:00",
+  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+}
\ No newline at end of file
diff --git a/identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_2 b/identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_2
new file mode 100644
index 00000000..0e070b16
--- /dev/null
+++ b/identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_2
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQEJjqeNoBXcaej6besvdunuO4E6i0Z5/1GaJIwY9D3fFPIbC4uApVQ="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
\ No newline at end of file
diff --git a/identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_2 b/identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_2
new file mode 100644
index 00000000..a5d484a2
--- /dev/null
+++ b/identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_2
@@ -0,0 +1,14 @@
+{
+  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQHi2HjaMFvkT37wGVHDSLVSBJsjbX1bSFtpbV7nRB7FaFDa/LO87Kw="
+=======
+    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
+>>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
+  },
+  "created_at": "2026-08-14T05:29:30.176231+00:00",
+  "updated_at": "2026-08-14T05:29:30.176231+00:00"
+}
\ No newline at end of file
diff --git a/identities/a7ca3944-af0e-498b-abd1-6af456468102.json b/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
index 509c5791..4a4378ed 100644
--- a/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+++ b/identities/a7ca3944-af0e-498b-abd1-6af456468102.json
@@ -3,7 +3,7 @@
   "name": "Docker Test Identity",
   "auth_method": {
     "type": "password",
-    "password": "ENC:v1:U1RSTQEJjqeNoBXcaej6besvdunuO4E6i0Z5/1GaJIwY9D3fFPIbC4uApVQ="
+    "password": "ENC:v1:U1RSTQGXoqIZjJDGBOZHAQlOTA0tey+7GzHxpo/iqoS4Zrf8PrX5n2mVbhY="
   },
   "created_at": "2026-08-14T05:20:24.759864+00:00",
   "updated_at": "2026-08-14T05:20:24.759864+00:00"