Updated word glossary file
rosolved merge conflict