fixed name of merge field
Merge branch 'master' of github.com:greenmintleaf/typo