Elijah will resolve all disputes in the end of days, including those about the calendar and the times appointed for redemption.

-Talmud, Eruvin 43b