diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index ac06cdcc0..697585e0c 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -1,5 +1,4 @@
 class ChallengesController < ApplicationController
-<<<<<<< HEAD
   before_action :require_login, :check_auth
   before_action :find_shixun, only: [:new, :create, :index]
   skip_before_action :verify_authenticity_token, only: [:create, :update, :create_choose_question, :crud_answer]