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

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