TEST: still something fails in resolver
FIX: fix setting mark after merge
FIX: fix inner error reporting

Overflow should be checked _after_ increment, otherwise
it will go to next round. Luckily was caught
by autovivification checks.
FIX: fix setting mark after merge