added test mergeWithCollisions().
upgraded assrtj-core to version 1.6.0.