Updated to work with new merge_hw_tables.merge_files() functionality.