When a user asks for a proof build with a specific shelve,
QB returns an error quoting the list of all the user's shelve on the server( and not only the one he used for proof build)

Currently what happens :
11:41:15,791 DEBUG - XXXX.cpp - merging XXXX.cpp@=34807
11:41:15,791 DEBUG - Diff chunks: 0 yours + 0 theirs + 0 both + 1 conflicting
11:41:15,791 WARN - XXXXX.cpp - resolve skipped.
11:41:15,791 DEBUG - YYYYY.h - merging YYYYY.h@=34807
11:41:15,791 DEBUG - Diff chunks: 3 yours + 0 theirs + 1 both + 1 conflicting
11:41:15,791 WARN - YYYYY - resolve skipped.
11:41:15,791 DEBUG - ZZZZZ.cpp - merging ZZZZZ.cpp@=34807
11:41:15,791 DEBUG - Diff chunks: 16 yours + 2 theirs + 0 both + 2 conflicting
11:41:15,791 WARN - ZZZZZ.cpp - resolve skipped.

Conflicts found while unshelving changes '34833,34885,4285,34103,34807,11440,2064,29141' from user 'user'. Please resolve and re-shelve.

Expected result :
Conflicts found while unshelving changes '34807' from user 'user'. Please resolve and re-shelve.

And even it would be great to have something more like :
Conflicts found in @34807 for files :
XXXXX.cpp
YYYYY.h
ZZZZZ.cpp

THanks !