re-apply lost commits