added basic test for merge, ref #90