You hit a merge violation. Delete the files and re-get from SVN.