bad conflict fix