added merge stuff