Gave the merge script a large amount of TLC.
Removed deprecated merge method.