What should a pilgrim performing Tamattu' Hajj do if he shaves after 'Umrah, and no hair is left to be shortened or shaved after Tawaf Al-Ifadah?

It is better for the pilgrim performing Tamattu' Hajj to shorten his hair after the 'Umrah of Tamattu' and to reserve shaving for the release from the Hajj, based on the Prophet, peace and blessings be upon him, who said: "Release yourselves from your ihram by circumambulating between Safa and Marwah and shortening [your hair]." However, if he shaves, it is permissible.