Revert "inserting changes in merger"

This reverts commit ad993f70e28d509f14c48d714ad90316454ec982.

Conflicts:
	src/AlibavaClusterCollectionMerger.cc
tiny fix
tiny fix
Merge branches 'master' and 'mastercopy2'