fixed rogue merge