fixing rebase issues and updating version number