This should cleanly apply on top of the one you recently merged.