Gittin 74: Machlokes at the time of Mashiach

The Pnei Yehoshua's explanation in Rashi that there will be no Machlokes then.