Update slides 2-4 in the [Ch5-MergeConflicts.pptx](https://github.com/HFOSSedu/GitKit-Codespace/blob/draw.io-images/materials/slides/Ch5-MergeConflicts.pptx) slide deck.