Conflicts: vendor/built_in_modules/ask/init.rb vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb vendor/built_in_modules/ask_new/config/routes.rb