Update scripts.conf

resolved merge conflicts in scripts.conf