Merging in github