Resolve Merge Conflicts in the UI: Iteration 2
Inline editing