proper timeout
fixed merge issue