Merge branchs