Merge in rebase