Merging 2 branches for partners