Fixes merge forward error only present on master
Merge pull request #1306 from bmbouter/fix-mongodb-merge-error-on-master

Fixes merge forward error only present on master