Resolve merge conflict in api.json