Use the rebase extension so any changes we've made are rebased on top of incoming changes