add conflict resolution methods