almost done merging