0 problems that someone has had in the past that they do not worry about because they happened a long time ago and cannot now be changed:
Yes, we did have our disagreements but that's water under the bridge now.
1 something that happened in the past and cannot now be changed:
Yes, we did have our disagreements, but that’s water under the bridge.