diff --git a/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686463.json b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686463.json
new file mode 100644
index 00000000..568230f2
--- /dev/null
+++ b/backups/conflicts/a7ca3944-af0e-498b-abd1-6af456468102_conflict_1786686463.json
@@ -0,0 +1,10 @@
+{
+  "id": "a7ca3944-af0e-498b-abd1-6af456468102",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+    "password": "ENC:v1:U1RSTQFYyHgmsoe9kuSYbZieirkaEwxd2zTtM2PH79UnDUx3P36Go2DUaM0="
+  },
+  "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_1786686463.json b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686463.json
new file mode 100644
index 00000000..95885b11
--- /dev/null
+++ b/backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1786686463.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/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json b/backups/conflicts/d3182263-9145-46f3-acdf-9cdce6b4f1c0_conflict_1786686463.json
similarity index 100%
rename from identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
rename to backups/conflicts/d3182263-9145-46f3-acdf-9cdce6b4f1c0_conflict_1786686463.json
diff --git a/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json b/backups/conflicts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02_conflict_1786686463.json
similarity index 100%
rename from hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json
rename to backups/conflicts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02_conflict_1786686463.json
diff --git a/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_1 b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_1
new file mode 100644
index 00000000..19128175
--- /dev/null
+++ b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_1
@@ -0,0 +1,17 @@
+{
+  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "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:42:03.155846+00:00",
+  "updated_at": "2026-08-14T05:42:03.155846+00:00"
+}
\ No newline at end of file
diff --git a/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_1 b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_1
new file mode 100644
index 00000000..19128175
--- /dev/null
+++ b/hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_1
@@ -0,0 +1,17 @@
+{
+  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "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:42:03.155846+00:00",
+  "updated_at": "2026-08-14T05:42:03.155846+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 568230f2..701d9611 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:U1RSTQFYyHgmsoe9kuSYbZieirkaEwxd2zTtM2PH79UnDUx3P36Go2DUaM0="
+    "password": "ENC:v1:U1RSTQHnI5Rt3DJnMAtboFdmylS8FD4+5hyuWDxTa2V4HYT3x6ivF+Xi1lI="
   },
   "created_at": "2026-08-14T05:20:24.759864+00:00",
   "updated_at": "2026-08-14T05:20:24.759864+00:00"
diff --git a/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_1 b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_1
new file mode 100644
index 00000000..18033f9f
--- /dev/null
+++ b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_1
@@ -0,0 +1,14 @@
+{
+  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQFYyHgmsoe9kuSYbZieirkaEwxd2zTtM2PH79UnDUx3P36Go2DUaM0="
+=======
+    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
+>>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
+  },
+  "created_at": "2026-08-14T05:42:03.153822+00:00",
+  "updated_at": "2026-08-14T05:42:03.153822+00:00"
+}
\ No newline at end of file
diff --git a/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_1 b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_1
new file mode 100644
index 00000000..8b693235
--- /dev/null
+++ b/identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_1
@@ -0,0 +1,14 @@
+{
+  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
+  "name": "Docker Test Identity",
+  "auth_method": {
+    "type": "password",
+<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
+    "password": "ENC:v1:U1RSTQGkBLimjyZO3SISWOquBk+MyhMd3qLN8/Vn6H+Yj3x5hHJ2IXFMsOs="
+=======
+    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
+>>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
+  },
+  "created_at": "2026-08-14T05:42:03.153822+00:00",
+  "updated_at": "2026-08-14T05:42:03.153822+00:00"
+}
\ No newline at end of file