made merge take files, kind of