colored underlines
mergeconflicts