Updated the merging script for the new file configuration