added merge test