update word glossary file
update world glossary file
resolve merge conflict