Understanding some ahadith on the relative merits of Ramadan and Jihad

[yousuf abu zayd]

Asalaamu alaykum Sheikh Aslam

In a recent Jummah khutba the khateeb mentioned a hadith on the merits of Ramadan which I had heard before. I can't remember it exactly but it was about two sahaba who came to islam at the same time; one died in jihad and the other one died later. Another sahabi had a dream about them and saw that the one who died later had a higher status than the one who died in jihad, and the Prophet (saw) explained it by saying that the second one was able to fast another Ramadan compared to his companion.

Then I was listening to a lecture in which were mentioned the many ahadith about the high status of Jihad, amongst which the Prophet (saw) told us that Jihad has more reward than fasting, Salah etc, and that standing in the ranks facing battle is better than 60 years of ibadah.

My question is, what is the correct understanding of the merits of Jihad and Ramadan in the light of these ahadith? One the one hand Ramadan raised the rank of the sahabi over his companion and on the other hand Jihad has more reward than a long period of fasting, salah etc.

Wasalaam