Merge the two banches