C

c4cs-w16-conflict2

An example of merging with a file conflict.