removed timeouts
fix merge conflict