Detect conflicts when agents or developers edit the same context or overlapping fields in Context Composer

Show inline conflict badges and a side-by-side diff view with per-field highlights

Offer resolution options: accept mine, accept theirs, merge, edit manually