Fix merge.conflictstyle.