Merging in the new branches