Fixed merging messup