Merge two branches