updated conflict resolution