Lade till glossary
Fixade merge conflict