ignore most changes but also fixed icons
fixed merge conflicst