One of Barcelona's most important players under manager Hansi Flick has agreed to a new contract, ending a long period of contentious negotiations which had become a popular topic within the club's media following.