fixing map
merge