attempt to merge added or deleted files to the file list