You need to clean up these helpful marks (lines 2, 4, 6, 8 9. 13 here) before committing. They only show up to assist you in deciding what changes to keep and discard in the file when merging.