oh. so are we ok just merging then?