Resolved a confilict.