fix bug in FeatureExtractor
merge files