fix timeout settings & update merry module