map data change due to conflict