do a proper merge