nanzhu:merge fixed