Teach merge conflicts as bonus content

[Kelly Sovacool, PhD]

Sometimes learners ask about it, although there isn't typically enough time to teach it in the main lesson.

Start with this and modify it.

[Zena Lapp]

Good idea - this way we can also direct them to the curriculum if they as and we don't have time to teach it.