Updated Word glossary file
resolved merge conflict