fix merge error in application controller that i thought i fixed before last commit