fixed bug in github rebase