Update config/merge.lua

Merge for 'Mastery: Hand of Light' and 'Beast Cleave'