SVN remains in conflict?
svn remove --force yourfilenamesvn resolve --accept=working yourfilenamesvn commit -m ""