Fix rebasing after making merge commit