Update lang.md
merge & resolve conflict