Updating version due to earlier conflict