fix merge.py
fix feature_gen.py
fix merge.py