Fixed the merging muff up