Issue with sync

[szymas]

I am receiving this error message, how do I correct it?

The following items have unresolved conflicts and will not be synchronized:
Folder pair: P:\House\Logos <-> C:\Volumes\wj\HQFiles\Logos
.DS_Store: Both sides have changed since last synchronization.

[Plerry]

Please no double posting:
viewtopic.php?t=11967