updated conflict resolution step