Resolved merge conflict in vault_prepare_certs.sh