fix merge screw-up