confilct resolved