Be more precise in logs about conflict resolution on a file/folder