How to tackle conflict