Fix little merging screw-up