DOCS-14-objectivec solving merge conflicts