My first line to conflict with
Fix conflict
conflict.merge.txt