fix merge goof