The Conflict Between Aristotle and Christianity

The virtues that Aristotle has in mind don't really seem to be the virtues that are most highlighted in Christianity. So it's not all about faith, open charity; it's about justice, temperance, courage and things like that. But do they have a different kind of way of conceiving of virtue than Aristotle did? That's a very difficult question to answer because the catalogue of virtues is very, very long.