Change name of merge-mergesort exercise

[figaw]

Call it sth like merge-conflict for context since it's an exercise about merge conflicts, it's not about the implementation of mergesort.

[JKrag]

I agree that the suggested name change would make a lot of sense. We just have to remember to update all our slide decks when we make this change.