remove merge and lower the lock to 240 sec