Added some string questions
fixed merge conflict