Update Ch5-MergeConflicts.pptx - Slides 13-16 - Practice

[braughtg]

Update slides 13-16 in the Ch5-MergeConflicts.pptx slide deck.

Here there are no images to be updated, but the commits in the boxes showing the text being merged should be updated to use letters as in other diagrams.