merge changes with timeout change