Fix another merge problem