input file filter bug fixed
conflict merged