Merging branch on github