Fixed the merge script again. It seems to work more correctly now (arrays nested in hashes nested in arrays make for complicated merges).