bumping version number to resolve conflict