Improve merge conflict markings.