merge the two branches