Maori Party leaders have come out of a meeting with Prime Minister John Key saying the problems between them have been resolved.
The party's co-leaders, Pita Sharples and Tariana Turia, were last week "bitterly disappointed" by Mr Key's comment that the government could ignore Waitangi Tribunal recommendations.
The tribunal is hearing an application by the Maori Council to delay the partial privatisation of four state-owned energy companies until Maori claims to water rights have been resolved.
The co-leaders said Mr Key's comment was an insult to all Maori and sought an urgent meeting with him.
That didn't happen until late on Wednesday night, and after 90 minutes of talks a joint statement was issued saying that when the tribunal issues its findings there will be a further meeting to "jointly discuss the matter".
Mrs Turia told reporters Mr Key had given an undertaking that the government would not legislate to take away any Maori rights to water - an issue which had not previously been mentioned by the Maori Party.
But Mrs Turia said it was the main issue, because her party had been concerned that there might be "another Foreshore and Seabed Act" which would remove Maori rights.
The dispute with Mr Key had cast doubt over whether the Maori Party would continue with its support agreement with the government, but that is no longer an issue.