You and you-know-who are going through a rough patch. That's perfectly normal. That's what happens when two people are so closely aligned. You're only human. Remember the key to any relationship (a romantic relationship, a work relationship, whatever) is compromise. That doesn't mean you have to compromise on the stuff that's really important to you. It just means that you give a little and they give a little until you both find common ground. The only reason you two came to a head in the first place is because you both truly, deeply care.