Revert "Revert "Fix merges of non-zero vector stores""