resolveConflicts