adding minimap marker highlighting + focusing
resolved conflicts