Modify  map
conflict resolve