merge from netease