Increase time allowed for conflict-resolution test to finish; takes MUCH longer from CLI for some reason