fix merge problems and add all to visual_features_filename because of ## in config