Failed to Commit Transaction (File Conflicts)

That was fixed over a day ago. Update your mirrors and perform a full upgrade.