Getong1123solving r/r s/r conflicts

shuo, i love you hehe