Updated word glossary file
resolved merge conflict