Fix merge screw-up