Fix another bad merge