resolved left out merge

lm_eval/api/samplers.py

@@ -83,16 +83,6 @@ class ContextSampler:
                 else self.doc_to_choice(doc)[doc_content]
             )
             labeled_examples += self.target_delimiter
-<<<<<<< HEAD
-            labeled_examples += (
-                str(doc_target[0])
-                if isinstance(doc_target, list)
-                else str(doc_target)
-                if self.config.doc_to_choice is None or isinstance(doc_target, str)
-                else str(self.doc_to_choice(doc)[doc_target])
-            )
-            labeled_examples += self.fewshot_delimiter
-=======
             if doc_target != "":
                 labeled_examples += (
                     str(doc_target[0])
@@ -102,7 +92,6 @@ class ContextSampler:
                     else str(self.doc_to_choice(doc)[doc_target])
                 )
                 labeled_examples += self.fewshot_delimiter
->>>>>>> mmlu-pro-changes
 
         return labeled_examples