New: resolveconflicts