fixed merge issue with application_controller