Update version after the merge