Change nothing; just mark the branch as merged, because for all intents and purposes, it is (this is a Launchpad UI hack merge).