fix $TEMP variable in scripts
fix merge confilict in package.json