merging api changes