merge
fix script error