changed the version number for merging