purging conflicts in SVN