merge & fix lang