fix merge screw up