Fairy Merge fix