can't get rid of u1conflict files

Binary package hint: ubuntuone-client

I have all my music, photos and documents in the u1 cloud so i have my two main machines always synced. however, i noticed that when i played a couple of files in banshee (which writes rating, play counts etc to metadata in file) it reuploads them to cloud every time, which is fine.

but i've now noticed those files get deleted from my other computer, and a u1conflict file is left in it's stead. and i can't delete the file, it just reappears. if i try to copy over a new file from the other computer, it gets renamed u1conflict1.

what to do? how to get my songs back on my laptop?

ProblemType: Bug
DistroRelease: Ubuntu 11.04
Package: ubuntuone-client 1.6.2-0ubuntu1
ProcVersionSignature: Ubuntu 2.6.38-8.42-generic 2.6.38.2
Uname: Linux 2.6.38-8-generic i686
NonfreeKernelModules: nvidia
Architecture: i386
Date: Sun May 22 16:07:25 2011
InstallationMedia: Ubuntu 11.04 "Natty Narwhal" - Release i386 (20110427.1)
PackageArchitecture: all
ProcEnviron:
 LANGUAGE=en
 LANG=en_GB.UTF-8
 LC_MESSAGES=en_US.UTF-8
 SHELL=/bin/bash
SourcePackage: ubuntuone-client
UbuntuOneSyncdaemonExceptionsLog:

UpgradeStatus: No upgrade log present (probably fresh install)