fix script
fix merge