updated version number
made changes to return a string if there are no conflicts