F14 to F15 upgrade issues

[jeff at bubble.org]

trying to upgrade from F14 to F15 on an x86_64 system.

I've done the following:
1) yum install fedora-release-rawhide
2) yum --disablerepo=* --enablerepo=rawhide update

after the second command I get some dependency problems due to having
rpm-fusion repo installed, all the packages its complaining about are
around the VLC package I installed -

Error: Package: ffmpeg-libs-0.6.2-1.fc14.x86_64 (@rpmfusion-free-updates)
           Requires: libopenjpeg.so.2()(64bit)
           Removing: openjpeg-libs-1.3-10.fc14.x86_64 (@updates)
               libopenjpeg.so.2()(64bit)
           Updated By: openjpeg-libs-1.4-6.fc16.x86_64 (rawhide)
               Not found
Error: Package: vlc-core-1.1.9-1.fc14.x86_64 (@rpmfusion-free-updates)
           Requires: libmatroska.so.2()(64bit)
           Removing: libmatroska-1.0.0-1.fc14.x86_64 (@fedora)
               libmatroska.so.2()(64bit)
           Updated By: libmatroska-1.1.0-1.fc16.x86_64 (rawhide)
               Not found
Error: Package: vlc-core-1.1.9-1.fc14.x86_64 (@rpmfusion-free-updates)
           Requires: libebml.so.2()(64bit)
           Removing: libebml-1.0.0-1.fc14.x86_64 (@fedora)
               libebml.so.2()(64bit)
           Updated By: libebml-1.2.0-1.fc16.x86_64 (rawhide)
               Not found


ok, no big deal I'll just skip the broken with:

yum --disablerepo=* --enablerepo=rawhide --skip-broken update
I then proceed to download almost 700MB of data and I get the following
error:

Running Transaction Test


Transaction Check Error:
  file /usr/share/man/man1/dtrace.1.gz from install of
systemtap-sdt-devel-1.5-1.fc16.x86_64 conflicts with file from package
systemtap-1.4-2.fc14.x86_64

Error Summary
-------------


and everything stops at this point, suggestions for a work-around?

Thanks, Jeff