added merge support