Merge branch 'pybamm-team:main' into tests

Author: santacodes

CODE-OF-CONDUCT.md

@@ -1,7 +1,7 @@
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE-OF-CONDUCT.md)
 
 
-# Contributor Covenant Code of Conduct
+# `pybamm-cookiecutter` Code of Conduct
 
 ## Our Pledge