fix map_test
update merge