How to fix a merge conflict on a directory?

[David Aldrich]

Hi

As a result of merging from trunk to a branch using a 1.7 svn client. Several 
directories now have conflicts. For example, directory 'Documents' contains 
dir_conflicts.prej, which contains:

Trying to delete property 'svn:mergeinfo'
but the local property value is different.
<<<<<<< (local property value)
/branches/TRY_DRA_Gc​c44_29Oct2011/Docume​nts:3862
/branches/TRY_DRA_Gc​c44_29Sept2011/Docum​ents:3863-3983
/branches/TRY_DRA_Py​thon_14July10/Docume​nts:2616-2748
[snip]
/trunk/Documents:486​3-4900=======

>>>>>>> (incoming property value)

How do I resolve this type of conflict please?

David