updating version
fixing merge conflict