Fixed Merge issues
[vicar] / src / data / icons / vicar_harmattan.png
src/data/icons/vicar_harmattan.png