硬编码去除
merge