Fixing merge gone rogue