Update scripts_warps.conf

resolved merge conflict in scripts_warps.conf