Teaching merge conflicts.