How to handle conflict