Asalaamu'Alykum,
Abu'Sa'ad (radhiyaAllaahu anh) related that the Messenger of Allah said,
"Hajj and Umrah will indeed be made to this House (the Ka'bah) (even) after the coming out of Yajooj & Majooj."
(Ahmad)
Hajj Will be Abandoned just before the coming of the Hour:
The following is related from Sho'bah from Qataadah:
"The Hour will not arrive until Hajj will no longer be made to the House (the Ka'bah)." And in a Hadeeth related by Abu Sa'eed Al-Khudree (radhiyAllaahu anh), the Prophet saw said, "The Hour will not arrive until Hajj is no longer made to the House (the Ka'bah)."
Taken from "Book of the End: Great Trials and Tribulations by Ibn Katheer rahimahullaah:
There is no contradiction between the above mentioned narrations. People will continue to perform Hajj and 'Umrah even after the coming out of Yajooj and Majooj - after they are destroyed, when people will live in peace and when there will be much sustenance. This will occur during the time of Al-Maseeh (alaayhis-salaam). Then Allah (subhaanahu wa ta'aala) will send a good wind that will take the soul of every believer. Before that occurs, Allah's Prophet, Eesa (alaayhis-salaam) will die, and the Muslims will pray over him. He Eesa (alaayhis-salaam) will be buried in the Prophet's chamber with the Messenger of Allah. Then the Ka'bah will be destroyed at the hands of Dhee As-Suwaiqatain, even though he might appear during the period of Al-Maseeh, as was mentioned by Ka'ab Al-Ahbaar.
Alhamdulilah
Asalaamu'Alykum
Abu'Sa'ad (radhiyaAllaahu anh) related that the Messenger of Allah said,
"Hajj and Umrah will indeed be made to this House (the Ka'bah) (even) after the coming out of Yajooj & Majooj."
(Ahmad)
Hajj Will be Abandoned just before the coming of the Hour:
The following is related from Sho'bah from Qataadah:
"The Hour will not arrive until Hajj will no longer be made to the House (the Ka'bah)." And in a Hadeeth related by Abu Sa'eed Al-Khudree (radhiyAllaahu anh), the Prophet saw said, "The Hour will not arrive until Hajj is no longer made to the House (the Ka'bah)."
Taken from "Book of the End: Great Trials and Tribulations by Ibn Katheer rahimahullaah:
There is no contradiction between the above mentioned narrations. People will continue to perform Hajj and 'Umrah even after the coming out of Yajooj and Majooj - after they are destroyed, when people will live in peace and when there will be much sustenance. This will occur during the time of Al-Maseeh (alaayhis-salaam). Then Allah (subhaanahu wa ta'aala) will send a good wind that will take the soul of every believer. Before that occurs, Allah's Prophet, Eesa (alaayhis-salaam) will die, and the Muslims will pray over him. He Eesa (alaayhis-salaam) will be buried in the Prophet's chamber with the Messenger of Allah. Then the Ka'bah will be destroyed at the hands of Dhee As-Suwaiqatain, even though he might appear during the period of Al-Maseeh, as was mentioned by Ka'ab Al-Ahbaar.
Alhamdulilah
Asalaamu'Alykum