Update AppDelegate.m

add merge