i saw the conflict and thought maybe it was an old package laying around and switched from yum update to yum upgrade (on the same box) and the upgrade went fine. maybe it is just some small bug in yum?