updated version number
made changes to return a string if there are no conflicts
Merge pull request #12 from GoBoundless/refactor_strings_working

Refactor strings working