add ios 2
manage conflict