agregado icono ios
conflicts resolved