Remove HEAD conflict delimiter and italicize filenames