Conflict update