fix conflict in CONTRIBUTING.md