fixes #562

adds core lang merging
GSMERGELANG false to disable, and go back to token display