All wars, oppression and corruption will come to an end in the time of Hazrat Mahdi (as)

THE FLAME OF STRIFE AND CONFLICT WILL BE PUT OUT, OPPRESSION, NIGHT RAIDS AND THE HABIT OF PILLAGING WILL COME TO AN END, AND WARS WILL DISAPPEARin the time of Hazrat Mahdi (as). 
(Al-Mahdi Al-Maw’ud, Vol. 1, p. 264)

Yes, ALMIGHTY ALLAH WILL SEND THE GREAT PURIFIER (HAZRAT MAHDI [AS]) WHEN STRIFE AND ENMITY ENFOLD THE WORLD, WHEN EVERYWHERE IS FILLED WITH OPPRESSION, RUINATION AND PILLAGING, TO TEAR DOWN THE BASTIONS OF DEPRAVITY AND DEVIATION (to intellectually neutralize the circles that deviate towards falsehood leaving the truth behind), TO UNIFY HEARTS OF STONE AND DARKNESS AND ENLIGHTEN THEM WITH HUMANITY AND THE LIGHT OF JUSTICE.  (Al-Mahdi Al-Maw’ud, Vol. 1, p. 310)