glossary update
reloved merge conflict