added merge, untested