decrease merge timeout