resolveconflict2