fixing versioning errors
merging