Conflict resolve
Conflict resolve

ichu501/GKFadeNavigationController,kalsariyac/GKFadeNavigationController,RyanTech/GKFadeNavigationController,ajijoyo/GKFadeNavigationController,RyanTech/GKFadeNavigationController,Pingco/GKFadeNavigationController,mohsinalimat/GKFadeNavigationController,Pingco/GKFadeNavigationController,gklka/GKFadeNavigationController,Pingco/GKFadeNavigationController,kalsariyac/GKFadeNavigationController,YotrolZ/GKFadeNavigationController,ajijoyo/GKFadeNavigationController,insidegui/GKFadeNavigationController,YotrolZ/GKFadeNavigationController,insidegui/GKFadeNavigationController,insidegui/GKFadeNavigationController,ajijoyo/GKFadeNavigationController,kalsariyac/GKFadeNavigationController,ichu501/GKFadeNavigationController,YotrolZ/GKFadeNavigationController,RyanTech/GKFadeNavigationController,mohsinalimat/GKFadeNavigationController,mohsinalimat/GKFadeNavigationController,ichu501/GKFadeNavigationController