added map merge and test