Merge dos branchs