Updated iOS tutorial to resolve conflicts