I addressed your concern with the commit message and linked it directly. Honestly, I'm ready to wash my hands of all of this but I'm not willing to roll over, so yeah it is kinda messy but that's the nature of this situation.
Just my two cents. I know passions are high and it’s tempting to see this as a struggle for power but I think that will only worsen the situation honestly. I would disengage completely from this situation and start up your own fork if you wish to continue working on this codebase.