Use minimap.
Conflict resolved.