Use diff3 style for conflicts.