See concurrent edits
Link to show concurrent edits
Use 'you' in edit message
Fix merge conflict
Merge pull request #2762 from guardian/facia-tool-concurrent-edit

Facia tool: better concurrent editing