Merge with base site