Rewrote merge_files function to handle case when multiple modules claim