I cant use their diplomats to make peace with each other, and force_diplomacy has not worked in my experience. I assume the only thing to do will be to load a savegame from a while before they began fighting each other, and remove diplomats from the game and hope it doesn't happen again.
I'm not too keen to go back in time right now, but eventually I'll get over it.