fixed some confilict bug