Polygamy 

I'm not personally expressing an opinion as to who — you, or the IP editor — is right (or righter) in this dispute, but it does seem to me that there has got to be a better solution than the current revert war.