provision.sh: fix merge conflict I had