fixup revert conflicts