rebasing before next commit