Testing the merge feature of git and github