merge from baidu