still have conflict and how to handle