Update version conflicts