Fix a bad merge after rebase.