Merge both branches.