changing the script
fixed merge conflict