Merge "Fix flakyness of Conflict Resolution integration tests."