Use diff3 for merge conflicts