Rebase it all to ensure we are on the same base as the rest of the team