added glossary
resolved conflict in extra glossary