corrects timeouts
merges conflicts