Fix another merge failure