make_filelist
fix conflict