Merge with In Progress resulted in one or more conflicts; see the Resolve Conflicts window for details. The shelveset has ...

Merge with In Progress resulted in one or more conflicts; see the Resolve Conflicts window for details. The shelveset has been preserved in Suspended  Shelved Work. After resolving the conflicts, you can [delete this shelveset](Click to delete shelveset after resolving merge conflicts).