Fixed a bug in which merge was receiving a 0-length array, and updated the ndpp_data.py library to accomodate the new data structure.