Fix up bad merge