versioning before master merge