remove none use code
commit
resolve confilict