Unconflicting ruby_string method

Looks like the conflict was created by the msftidy fixes that happened
over on the master branch. No big deal after all.