modify b
confilict