"merge" the file split manually to the branch
more merging just to be sure

most of the changes are whitespace