Improve rebase integrate