FIX: autovivification after --continue when marks are used

Test: Modify merge_conflict case so it includes inner merge