deleted unwanted icons
resolving conflicts