diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb
index b304c8d41..0fcdaf941 100644
--- a/app/controllers/question_banks_controller.rb
+++ b/app/controllers/question_banks_controller.rb
@@ -188,8 +188,6 @@ class QuestionBanksController < ApplicationController
             q.exercise_bank_choices.try(:each_with_index) do |choice, index|
               exercise_question.exercise_choices.create({choice_position: index+1, choice_text: choice.choice_text})
             end
-
-<<<<<<< HEAD
             # 复制标准答案(填空题和问答题)  多空填空题的话，应该是原标准答案的exercise_choice_id，即为题空的位置。
             q.exercise_bank_standard_answers.try(:each) do |answer|
               exercise_question.exercise_standard_answers.create({exercise_choice_id: answer.exercise_bank_choice_id, answer_text: answer.answer_text})
@@ -200,18 +198,6 @@ class QuestionBanksController < ApplicationController
               exercise_question.exercise_shixun_challenges.create({position: index+1, challenge_id: sc.challenge_id,
                                                                 shixun_id: sc.shixun_id, question_score: sc.question_score})
             end
-=======
-          # 复制标准答案(填空题和问答题)  多空填空题的话，应该是原标准答案的exercise_choice_id，即为题空的位置。
-          q.exercise_bank_standard_answers.try(:each) do |answer|
-            exercise_question.exercise_standard_answers.new({exercise_choice_id: answer.exercise_bank_choice_id,
-                                                             answer_text: answer.answer_text})
-          end
-        else
-          # 复制实训题
-          q.exercise_bank_shixun_challenges.try(:each_with_index) do |sc, index|
-            exercise_question.exercise_shixun_challenges.new({position: index+1, challenge_id: sc.challenge_id,
-                                                              shixun_id: sc.shixun_id, question_score: sc.question_score})
->>>>>>> 97ffdc47dfa2949ba2f4ca008a469f6d8ff1d0a2
           end
         end
         # question_type：5实训题；其他是非实训题