This is the kind of conflict resolution I love to see on my dash!
This was just beautiful and heartwarming. :)