string mod
fixed merge conflicts