Merge with base repo