Added zoom inout marker on current location
Fixd conflict