added script files
fixed merge conflicts