merge #2, split to files