Sanhedrin 99-1: Yemos Hamashiach, Will they be different from Olam Hazeh?

Answering the contradiction in the Rambam.