oops, merge files all around