solve confilics