The second part of our git merging assignment