Better handling for multiple files from same repository

related to #407 
* Add conflict detection for source files
* Adjust download process for source files to ensure all files are correctly downloaded during restore process
can we get detectConflicts under test?