fixup matchers
fixup resets
merge in failing matchers