merge the two