The 21-year-old has put an end to months of speculation surrounding his future at Camp Nou, with a €25 million (£21.8m) clause inserted into his new contract, which extends his stay for an extra two years.