fix merge conflict screw up