Although they shouldn't have done that, it sounds like a small thing that escalated out of hand - if they've realised that they took it too far (and it sounds like they have - which might be part of the reason why they haven't knocked on your door today - they might not want to push it) then you should be able to work things out sensibly. Maybe you should just bite the bullet and take the first step and have a word with them.
However, you say it will be only a few days til they upset you again, are you having difficulties getting on generally?