finish lang_conflict

Signed-off-by: zhouyou <zhouyoug@gmail.com>