Update resolve conflict