Rebase from main repository