Fix conflicts in bringing ios up-to-date.