added merge timeout