--conflict resolution