merge dos branchs