Added merge tests
added merge.h .inl