fixup confict