The Pnei Yehoshua's explanation in Rashi that there will be no Machlokes then.
Source Sheet: https://res.cloudinary.com/ouinternal/image/upload/outorah pdf/b8jlo7itpjkafhobjpih.pdf