Fixup conflict