update
updated glossary file
resolved merge conflict