How do you handle merging different branches?