Rebase from master and commit new changes