Update AppDelegate.m

conflict try