fix conflict

.github/ISSUE_TEMPLATE/add_dataset.md

.github/ISSUE_TEMPLATE/add_model.md

.github/PULL_REQUEST_TEMPLATE.md

.github/PULL_REQUEST_TEMPLATE/fix_bug.md

.gitignore

README.md

convlab/base_models/t5/README.md

convlab/base_models/t5/dst/dst.py

convlab/base_models/t5/nlg/nlg.py

convlab/base_models/t5/nlu/nlu.py

convlab/deploy/dep_config.json

convlab/dialog_agent/agent.py

convlab/dst/comer/multiwoz/comer.py

convlab/dst/comer/multiwoz/function.py

convlab/dst/mdbt/multiwoz/dst.py

convlab/dst/setsumbt/README.md

convlab/dst/setsumbt/configs/setsumbt_joint.json

convlab/dst/setsumbt/configs/setsumbt_multiwoz21.json

convlab/dst/setsumbt/configs/setsumbt_multiwoz21_10p.json

convlab/dst/setsumbt/configs/setsumbt_multiwoz21_1p.json