Updated glossary file
resolved merge conflict