bumping versions
fixing merge conflict