fix alllll the merge conflicts

lm_eval/tasks/gsm8k/gsm8k.yaml

-group:
+tag:
   - math_word_problems
 task: gsm8k
 dataset_path: gsm8k

lm_eval/tasks/haerae/_default_haerae_yaml

-group: haerae
 dataset_path: HAERAE-HUB/HAE_RAE_BENCH
 test_split: test
 fewshot_split: test

lm_eval/tasks/haerae/_haerae.yaml

+group: haerae
+task:
+  - haerae_gk
+  - haerae_hi
+  - haerae_lw
+  - haerae_rw
+  - haerae_sn
+aggregate_metric_list:
+  - metric: acc
+    aggregation: mean
+    weight_by_size: true
+  - metric: acc_norm
+    aggregation: mean
+    weight_by_size: true
+metadata:
+  version: 1.0

lm_eval/tasks/headqa/headqa_en.yaml

-group:
-  - headqa
+tag: headqa
 task: headqa_en
 dataset_path: EleutherAI/headqa
 dataset_name: en

lm_eval/tasks/hellaswag/hellaswag.yaml

-group:
+tag:
   - multiple_choice
 task: hellaswag
 dataset_path: hellaswag

lm_eval/tasks/hendrycks_ethics/commonsense.yaml

-group:
+tag:
   - hendrycks_ethics
 task: ethics_cm
 dataset_path: EleutherAI/hendrycks_ethics

lm_eval/tasks/hendrycks_ethics/justice.yaml

 include: deontology.yaml
-group:
+tag:
   - hendrycks_ethics
 task: ethics_justice
 dataset_name: justice

lm_eval/tasks/hendrycks_ethics/utilitarianism.yaml

 include: commonsense.yaml
-group:
+tag:
   - hendrycks_ethics
 task: ethics_utilitarianism
 dataset_name: utilitarianism

lm_eval/tasks/hendrycks_ethics/virtue.yaml

 include: commonsense.yaml
-group:
+tag:
   - hendrycks_ethics
 task: ethics_virtue
 dataset_name: virtue

lm_eval/tasks/hendrycks_math/hendrycks_math.yaml

@@ -7,3 +7,9 @@ task:
   - hendrycks_math_num_theory
   - hendrycks_math_prealgebra
   - hendrycks_math_precalc
+aggregate_metric_list:
+  - metric: exact_match
+    aggregation: mean
+    weight_by_size: true
+metadata:
+  version: 1.0

lm_eval/tasks/hendrycks_math/hendrycks_math_algebra.yaml

-group:
+tag:
   - math_word_problems
 task: hendrycks_math_algebra
 dataset_path: EleutherAI/hendrycks_math

lm_eval/tasks/kmmlu/cot_hard/_cot_kmmlu_yaml

-group:
+tag:
     - kmmlu
     - kmmlu_hard_cot
 dataset_path: HAERAE-HUB/KMMLU-HARD

lm_eval/tasks/kmmlu/direct/_direct_kmmlu_yaml

-group:
+tag:
     - kmmlu
     - kmmlu_direct
 dataset_path: HAERAE-HUB/KMMLU

lm_eval/tasks/kmmlu/direct_hard/_direct_hard_kmmlu_yaml

-group:
+tag:
     - kmmlu
     - kmmlu_hard_direct
 dataset_path: HAERAE-HUB/KMMLU-HARD

lm_eval/tasks/kmmlu/hard/_hard_kmmlu_yaml

-group:
+tag:
     - kmmlu
     - kmmlu_hard
 dataset_path: HAERAE-HUB/KMMLU-HARD

lm_eval/tasks/kobest/kobest_boolq.yaml

-group:
+tag:
   - kobest
 task: kobest_boolq
 dataset_path: skt/kobest_v1

lm_eval/tasks/kobest/kobest_copa.yaml

-group:
+tag:
   - kobest
 task: kobest_copa
 dataset_path: skt/kobest_v1

lm_eval/tasks/kobest/kobest_hellaswag.yaml

-group:
+tag:
   - kobest
 task: kobest_hellaswag
 dataset_path: skt/kobest_v1

lm_eval/tasks/kobest/kobest_sentineg.yaml

-group:
+tag:
   - kobest
 task: kobest_sentineg
 dataset_path: skt/kobest_v1

lm_eval/tasks/kobest/kobest_wic.yaml

-group:
+tag:
   - kobest
 task: kobest_wic
 dataset_path: skt/kobest_v1