Use diff3 merge conflict style