s/r and r/r conflicts updated