merged rory