Give two methods of conflict resolution??