add conflict resolution