Gerard Pique says Lionel Messi "carries a lot of weight in the dressing room" at Barcelona but insists coach Luis Enrique calls the shots, and said the pair have moved on from their training-ground argument earlier this year.
The row had led to widespread speculation that Messi might force Luis Enrique out of the club, but any issues now appear to be in the past, with the Argentina star playing a leading role in Barca's run of 10 successive wins in all competitions.
Pique has now told "El Partido de los 12" radio programme: "There is no dressing room without arguments. Luis Enrique and Messi had an argument, but it is all over now, and there is no need to go back over it. The relationship with Luis Enrique has always been good and friendly."
He added: "Luis Enrique is in charge more than Messi, of course. He is the coach, the boss, although Leo carries a lot of weight in the dressing room."
Pique has also had some issues with Luis Enrique this season, with the coach apparently unimpressed with behaviour that included letting off a stink bomb on a preseason flight, using his mobile phone while a substitute on the bench during the Catalan Supercup final against Espanyol, and a late-night run-in with traffic police.
The Spain centre-back, who turned 28 earlier this month and recently had a second child with pop star Shakira, admitted non-sporting problems had been a problem for him earlier in the season but said he was now back on the right track.
"This season things are going great for me, and look -- at the start it was not as I wanted because I had two or three non-sporting issues," he said. "Luis Enrique was not playing me consistently, and it is very difficult to be able to show that you are fine physically. Then there were non-sporting things which affected my path a lot."
Barcelona-born Pique, who played for three seasons at Manchester United earlier in his career, said he was now sure he would finish his career at the Camp Nou.
"Every day I love my job more, and I would like to be here for more years," he said. "Today I can say that I am going to retire here at Barca, whether it is at the end of this season or within six. I am not going to play for another team."
Should his team not win the Champions League this season, Pique said he would root for Chelsea after Cesc Fabregas' move to Stamford Bridge in the summer.
"If Barca do not win the Champions League, I hope it's Chelsea," he said. "Cesc is there and he's my friend."