bugfix for merging
bugfix for merging

yhj630520/dpark,yanheven/dpark,zzl0/dpark,quxiaolong1504/dpark,yhj630520/dpark,zzl0/dpark,fe11x/dpark,Mignet/dpark,veritynoob/dpark,douban/dpark,junmoa/dpark,douban/dpark,dogeyes/dpark,oceanjack/dpark,windreamer/dpark,smarthomekit/dpark,mageia/dpark,mageia/dpark,smarthomekit/dpark,304471720/dpark,daishaowei/dpark,douban/dpark,smarthomekit/dpark,yhj630520/dpark,windreamer/dpark,veritynoob/dpark,304471720/dpark,dogeyes/dpark,fe11x/dpark,junmoa/dpark,Mignet/dpark,oceanjack/dpark,daishaowei/dpark,windreamer/dpark,douban/dpark,304471720/dpark,dogeyes/dpark,ee08b397/dpark,douban/dpark,quxiaolong1504/dpark,yanheven/dpark,veritynoob/dpark,windreamer/dpark