Resolved confilict