Geo-Tolerance vs Default Drawing Tolerance

I have a question about Geo-Tolerancing.  When showing a geo-tolerances in a drawing, does that negate, for those specific dimensions, the default standard tolerances shown in the title block.    In other words, when you specify a tolerance (not geo-tolerance) in a drawing, then the drawing tolerances are being over-ridden.  Does this also apply with geo-tolerances?  Our QA is adding using both, meaning that our sheet tolerance is +/-.005 AND adding another +/-.002 for geo-tolerance yielding an overall +/-.007.  I feel this is incorrect, that the sheet tolerance is omitted since there is another tolerance shown; whether standard sheet tolerance or geo-tolerance.  Any thoughts??  Thanks,  David

SolidworksDrawings And Detailing