diff --git a/internbootcamp/bootcamp/med_calculator/med_calculator.py b/internbootcamp/bootcamp/med_calculator/med_calculator.py
index 0ab60c6..21a4566 100755
--- a/internbootcamp/bootcamp/med_calculator/med_calculator.py
+++ b/internbootcamp/bootcamp/med_calculator/med_calculator.py
@@ -1,11 +1,7 @@
 import json
 import math
 import random
-<<<<<<< HEAD
-from bootcamp import Basebootcamp
-=======
 from internbootcamp.bootcamp.base import Basebootcamp
->>>>>>> remotes/origin/main
 
 def remove_boxed(s):
     if "\\boxed " in s:
@@ -158,11 +154,7 @@ class Medcalculatorbootcamp(Basebootcamp): # 医学计算器类
         return cases
 
 if __name__ == '__main__':
-<<<<<<< HEAD
-    bootcamp = MedCalculatorbootcamp(seed=42)
-=======
-    bootcamp = MedCalculatorSandbox(seed=42)
->>>>>>> remotes/origin/main
+    bootcamp = Medcalculatorbootcamp(seed=42)
     identity = bootcamp.case_generator()
     print(f'{identity = }')