Merge code bases