Use diff3 conflictstyle