anchor.diff:  
   
   -spec map_to_existing_file_uuid(file_meta:uuid(), file_meta:name(), file_meta:name(), file_meta:uuid() | undefined) ->
  -    {ok, file_meta:uuid()} | {error, not_found}.
  +    {ok, file_meta:uuid()} | {error, not_found | {conflicting_uuids, [file_meta:uuid()]}}.
   map_to_existing_file_uuid(ParentUuid, FileName, FileBaseName, undefined) ->
       case file_meta:get_matching_child_uuids_with_tree_ids(ParentUuid, all, FileBaseName) of
  -        {ok, [{ResolvedUuid, _}]} ->
  -            {ok, ResolvedUuid};
           {ok, UuidsWithTreeIds} ->
               Filtered = lists:filter(fun({FileUuid, _}) ->
                   case file_location:get_local(FileUuid) of
  
positive.code:         {ok, UuidsWithTreeIds} ->
              case lists:any(fun({FileUuid, _}) -> FileUuid =:= ExpectedFileUuid end, UuidsWithTreeIds) of
                  true -> {ok, ExpectedFileUuid};
                  false -> {error, not_found}
              end;
          {error, not_found} ->
              {error, not_found}
  
negative.code:                                         {error, not_found} ->
                                              maybe_import_file(StorageFileCtx, Info);
                                          {ok, SSIDoc} ->
                                              case {storage_sync_info:get_guid(SSIDoc), Reason} of
                                                  {undefined, _} ->
                                                      maybe_import_file(StorageFileCtx, Info);
                                                  {_Guid, not_found} ->
                                                      {?FILE_UNMODIFIED, undefined, StorageFileCtx};
                                                  {Guid, {conflicting_uuids, ConflictingUuids}} ->
                                                      % Check if storage_sync_info points to other conflicting file
                                                      case lists:member(file_id:guid_to_uuid(Guid), ConflictingUuids) of
                                                          true -> maybe_import_file(StorageFileCtx, Info);
                                                          false -> {?FILE_UNMODIFIED, undefined, StorageFileCtx}
                                                      end
                                              end
                                      end
                              end;
  