Fix up merger failure