It ended well

So, all's well.  The neighbor came over yesterday—on a different errand, actually—and asked me if everything was cool.  I said yes, she said it was with her too, and she said, "How about if we just start over?" 

Whew!  Sounds good to me. I'm very glad.