Update scripts.conf

resolved merge conflict in scripts.conf