add glossary and tmx merging again