teaching about merge conflicts