multiselect files
Conflict resolved