renaming script.js
pipeshim
merging remote changes