merge conflict

lm_eval/tasks/model_written_evals/advanced_ai_risk/fewshot-survival-instinct.yaml

+# Generated by _generate_configs.py
+dataset_name: fewshot-survival-instinct
+include: _template_yaml
+task: advanced_ai_risk_fewshot-survival-instinct

lm_eval/tasks/model_written_evals/advanced_ai_risk/fewshot-wealth-seeking-inclination.yaml

+# Generated by _generate_configs.py
+dataset_name: fewshot-wealth-seeking-inclination
+include: _template_yaml
+task: advanced_ai_risk_fewshot-wealth-seeking-inclination

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-coordinate-itself.yaml

+# Generated by _generate_configs.py
+dataset_name: human-coordinate-itself
+include: _template_yaml
+task: advanced_ai_risk_human-coordinate-itself

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-coordinate-other-ais.yaml

+# Generated by _generate_configs.py
+dataset_name: human-coordinate-other-ais
+include: _template_yaml
+task: advanced_ai_risk_human-coordinate-other-ais

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-coordinate-other-versions.yaml

+# Generated by _generate_configs.py
+dataset_name: human-coordinate-other-versions
+include: _template_yaml
+task: advanced_ai_risk_human-coordinate-other-versions

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-corrigible-less-HHH.yaml

+# Generated by _generate_configs.py
+dataset_name: human-corrigible-less-HHH
+include: _template_yaml
+task: advanced_ai_risk_human-corrigible-less-HHH

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-corrigible-more-HHH.yaml

+# Generated by _generate_configs.py
+dataset_name: human-corrigible-more-HHH
+include: _template_yaml
+task: advanced_ai_risk_human-corrigible-more-HHH

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-corrigible-neutral-HHH.yaml

+# Generated by _generate_configs.py
+dataset_name: human-corrigible-neutral-HHH
+include: _template_yaml
+task: advanced_ai_risk_human-corrigible-neutral-HHH

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-myopic-reward.yaml

+# Generated by _generate_configs.py
+dataset_name: human-myopic-reward
+include: _template_yaml
+task: advanced_ai_risk_human-myopic-reward

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-one-box-tendency.yaml

+# Generated by _generate_configs.py
+dataset_name: human-one-box-tendency
+include: _template_yaml
+task: advanced_ai_risk_human-one-box-tendency

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-power-seeking-inclination.yaml

+# Generated by _generate_configs.py
+dataset_name: human-power-seeking-inclination
+include: _template_yaml
+task: advanced_ai_risk_human-power-seeking-inclination

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-self-awareness-general-ai.yaml

+# Generated by _generate_configs.py
+dataset_name: human-self-awareness-general-ai
+include: _template_yaml
+task: advanced_ai_risk_human-self-awareness-general-ai

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-self-awareness-good-text-model.yaml

+# Generated by _generate_configs.py
+dataset_name: human-self-awareness-good-text-model
+include: _template_yaml
+task: advanced_ai_risk_human-self-awareness-good-text-model

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-self-awareness-text-model.yaml

+# Generated by _generate_configs.py
+dataset_name: human-self-awareness-text-model
+include: _template_yaml
+task: advanced_ai_risk_human-self-awareness-text-model

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-self-awareness-training-architecture.yaml

+# Generated by _generate_configs.py
+dataset_name: human-self-awareness-training-architecture
+include: _template_yaml
+task: advanced_ai_risk_human-self-awareness-training-architecture

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-self-awareness-web-gpt.yaml

+# Generated by _generate_configs.py
+dataset_name: human-self-awareness-web-gpt
+include: _template_yaml
+task: advanced_ai_risk_human-self-awareness-web-gpt

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-survival-instinct.yaml

+# Generated by _generate_configs.py
+dataset_name: human-survival-instinct
+include: _template_yaml
+task: advanced_ai_risk_human-survival-instinct

lm_eval/tasks/model_written_evals/advanced_ai_risk/human-wealth-seeking-inclination.yaml

+# Generated by _generate_configs.py
+dataset_name: human-wealth-seeking-inclination
+include: _template_yaml
+task: advanced_ai_risk_human-wealth-seeking-inclination

lm_eval/tasks/model_written_evals/advanced_ai_risk/lm-coordinate-itself.yaml

+# Generated by _generate_configs.py
+dataset_name: lm-coordinate-itself
+include: _template_yaml
+task: advanced_ai_risk_lm-coordinate-itself

lm_eval/tasks/model_written_evals/advanced_ai_risk/lm-coordinate-other-ais.yaml

+# Generated by _generate_configs.py
+dataset_name: lm-coordinate-other-ais
+include: _template_yaml
+task: advanced_ai_risk_lm-coordinate-other-ais