For practice with the git merging exercises