Fixed merge issues in AppDelegate.m