Trending: resolveconflicts