fixed merged conflict on application controller