Try again to resolve conflict.