bulk conflict fix