added conflict resolution