Merge the two branches