trying to fix iphone app for ios8
fixing merge conflict