and this will fix mapview
fix merge conflict