patch- cleaning up merge garbage in appController