merge(layer-c): inline conflict resolver + worker conflict plumbing

src/ClaudeDo.Localization/locales/en.json

@@ -361,6 +361,20 @@
       "loading": "Loading…"
     }
   },
+  "conflictResolver": {
+    "windowTitle": "Resolve merge conflicts",
+    "modalTitle": "RESOLVE CONFLICTS",
+    "loading": "Loading conflicts…",
+    "current": "Current (ours)",
+    "incoming": "Incoming (theirs)",
+    "mergedResult": "Merged result",
+    "acceptCurrent": "Accept Current",
+    "acceptIncoming": "Accept Incoming",
+    "acceptBoth": "Accept Both",
+    "editManually": "Edit manually",
+    "continue": "Resolve & continue",
+    "abort": "Abort merge"
+  },
   "controls": {
     "datePicker": {
       "today": "Today",