Update merge.lua - some Paladin changes / Spelling typo