Fixed s/r conflicts