Merge with base fork