Conflicts need resolving.
I'm aware of that. But because I'll introduce other conflicts by merging https://github.com/geany/geany/pull/3171, I'll wait until that one is merged.
Its meant to be long lazy summer days 😛
Yeah, just merging stuff is lazy :-)