Fixed the merging