Synchronize the overhaul with current master