Fixed Glossary links on feedback
Conflict in changelog resolved