solve confilct