added function to select multiple files
fixed merge conflicts