How to deal with conflict