bump version number
merging updates