just minor version bumps, for the package.json that get created
merge from remote and get own version number right
gitg gives me problems in resolving merges