fix bug when conflict