Merge with Bun