Resolved merge conflict in legscript.