missed conflict fix