Update word glossary file
resolved merge conflict