Rebase before pushing
Fixed rebase error.