BF and I recently got into a spat last night/into this morning regarding conflicting schedules. He's not too great with remembering when things are and in this case, the organization didn't tell him a straight up date so it was confusing to begin with and ended up being a major conflict. On top of that, he had made plans with one of his guy friends and the guy friend messaged me about it and I had no idea the plans existed even. We're slightly LD (only an hour apart so not really but enough to only see each other on weekends) and we already had plans set on the date the organization tried to change the event to. We worked it out, however he's still upset because he feels like he caused the fight and everything else.
Once you guys get fights resolved and the problem is fixed, any suggestions how to get over the after feelings? I'm working today and he's home so we can't exactly just kiss and make up or anything else.