Should I go make up with him?

More than make up with him, you should get on our knees and be thankful that he puts up with your being such an annoying skank.