fixed merge conflict
merge
added check if mapview