tree conflict: new folder with old name

Hi,
I know this is my fault, I'm just checking if there is a way to fix this.

I renamed a folder and then created a new folder with the old name of
the first one:

svn mv folder_name folder_name2008
svn ci -m "renamed folder_name"
mkdir folder_name
svn add folder_name
svn ci -m "added new folder with old name"

Since this, I have been having "tree conflict" problems. I tried with
svn resolved which works at the moment I run it, but later I get the
conflict back.

    C folder_name
    C folder_name2008
Updated to revision 1966.
Summary of conflicts:
   Tree conflicts: 2

Is there a way I can bring the repository to a stable state again?

Thank you!
Giampiero

svn, version 1.6.6 (r40053), on Ubuntu 10.04
Received on 2010-05-27 11:08:05 CEST