these are merge conflict notices.

Take a look at this:
http://genomewiki.ucsc.edu/index.php/Resolving_merge_conflicts_in_Git