stopmergeconflicts