How to view conflicting items

[philingle]

Hi

I have a file that has apeared in my mmex data folder called something like mmexfilename_computername_date_Conflict
Which assume is due to a conflict between the version synched from my phone and the one on my computer.

Is there any easy way of seeing what items are different between the two different versions?

Thanks

Phil