Commitmas 2: A Month of Merriment Challenge 9 - Merge and Merge Conflicts By Apollo Catlin, recording available.