confilct solved