map view
merge conflict