re-adding iOS merges