Fix another merge issue