Merge with base branch