Update scripts_guild.conf

resolved merge conflict in scripts_guild.conf