update jst language
merge conflict