FIX: some memory management stuff in merge, adding a third merge unit test
MERGE: Merge branch 'master' of github.com:izzycecil/Paratype