resolved confilct