C

c4cs-w16-conflict1

Example of an edit conflict