Fixed merge conflict in minimap