add by flw
resolve confilt