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

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