Roll-back to resolve conflict.