std: merge conflict cleanup from std::str