Conflict is hard - how does Paul approach it and how does Jesus talk about it?