Resolved conflicts in cm_strings after merging.