CSCI306-Git Merging Part II