add virtual-file
merge
fix