Notes on merge
changing version number up