Adding MapView
Merging Conflicts