Yes, everyone has that conflict it is normal. You can either remove the conflicting RPM (this works fine but up2date might try and reinstall it) or you can just force intstall the GLX.
Remove Mesa with:
rpm -e --nodeps XFree86-Mesa-libGL
or you can force install:
rpm -ivh --force nvidia-glx-1.0.4496-0.fdr.10.1.athlon.rpm
Either way works, I usually remove Mesa.
"..the triumph of evil is for good men to do nothing."
VIDIA video driver RPMs for Fedora
:: see yum repo at livna.org