Merge both of these branches, and the invisible (but current) branch. Work only on that one separate branch.
Practice trunk based development. Maybe yes. Maybe no. Branches are a good way to work with time-distributed and space-distributed teams working on open-source projects (EXACTLY the situation here).
The Sunday Mob has been working on this for a while. I don't know if it's been filed elsewhere as an issue. If so, merge the multiples.