merge code of xiaolai and yiling