fiddling with timeout errors
fixing conflict