Revert "Trimmed the branch to only the map_merger sub directory"

This reverts commit 76c59165a02ec47ce296ac3a6e5b93ba12b4f6ea.
Rebase from 'upstream'
Trimmed the branch to only the map_merger sub directory