Which is more important to a Muslim, personal Jihad or earthly Jihad (responding to evil in the world)?

When I was little ...I was told that Islam /muslim was a peacefull loving race/religion. Now it is Jihad....which totally contradicts the Peace aspect.