added merge testing