Fix merge error on function redefinition
Merge pull request #1488 from junmendoza/newMaster

Fix merge error on function redefinition