Added more logging to sync tasks.
Fixed discarding of changes to files contained in directories.
Added preference to control merge strategy.