Resolved confilct