Github Merge Or Rebase