Add override function for andMerge and orMerge
Merge pull request #2 from chemi123/develop

Add override function for andMerge and orMerge