Missed conflict fix