made merge take files, kind of part 2