merging almost final