Default wait set to 57
Merging conflicts