add conflict
conflict resolution