Fix failed merge of config.sh