merge diaoyan