Updated script location.
Resolved merge conflicts.