Fixed another conflict