diff3 conflictstyle