another conflict fix