Updated Word glossary file
resolved merge issues