diff --git a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
index b3f269e78..5de179f37 100644
--- a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
+++ b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
@@ -42,6 +42,5 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
       @frontend_style = @item.frontend_style
     end
     @item = Page.find(params[:page_id]) rescue nil
->>>>>>> a4fa967... Fix mailing redirect
   end
 end