Try to get that stupid merge done by renaming that directory. Finally I experience firsthand what I preached for years.

There is only one feature where clearcase is better than subversion: merging.