loading glossary definition.
Merge remote-tracking branch 'origin/master'
Committing conflict merge.