Updated the glossary word file
resolved merge conflict