ccc
updated word glossary file
resolved merge conflict