resolved editing conflicts in 11_glossary.md