Him and I made up. I don't feel like anything was resolved. I know that it's going to be the same thing the next time he works overnight or I have a horrible day. We love each other, but I don't think we trust each other.