Use diff3 conflicts.