My change to Lord.hs
Fixed merge on Lord.js