Disallow conflicts, clean up existing s/r and r/r conflicts.