conflict resolution methods