The easiest solution is delete the project from your hard drive and download the project from the team server again.
The other suggested option is to download tortoisesvn from here be sure to downlaod the correct version.
Use the options of tortoise svn to resolve the conflict.