adequate conflict resolution methods