Resolving merge conflict with provish.sh
updates from upstream