added merge howto