A local change that leads to a conflict.
Manually resolved the first merge conflict in text editor.