making ios only
fixing conflicts