resolver conflitos do svn