add a map
fix merge conflict