how to handle conflict?