Update timeout for archive merge and change message to encourage patience