update all script file
fixed merge conflict in script file