resolving svn conflicts