adjusted timeout
merge