Updated word glossary file
Resolved merge conflict