merge with base fork