Updated merge_data.py and data_utils.py so that the mergeAllTheThings() function works