Fixing merge conflict for icons on dashboard
Fixing merge conflict for icons on dashboard

CroatianBureauOfStatistics/sdg-indicators,zubairkhan930/sdg-indicators,zubairkhan930/sdg-indicators,CroatianBureauOfStatistics/sdg-indicators