For the second part of the Git Merging Exercise