Set timeout to very high value
Merge conflicts