solve confilict