fixed a problem with the merging