Move Corkscrew before merge