Merge API improvements