Massive star evolution at high metallicity