Remove HEAD conflict delimiter and italicize filenames
Merge pull request #84 from wbzyl/master

Remove HEAD conflict delimiter and italicize filenames. Thanks @wbzyl!