[iOS] endpoints included :)
[iOS] merge