Fix another conflict