iphone stuff
Resolve merge conflict