add conflict resolution docs