Conflict resolved…