Merge greatfile.txt

There is a merge conflict, how can it be resolved?