Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxx> writes: > Not a native speaker, but according to wikipedia > (https://en.wikipedia.org/wiki/Singular_they) it's OK to write > "maintainer [singular, but already neulral] may get merge conflicts when > they [sinugular they] ..." Yes.