teaching about merge conflicts - still