Fix permissions on repo

[alvestrand]

Seems like @dontcallmedom needs to fix this .... can you set the permissions in the usual way where the chairs can work on the repo in addition to the editors?

[dontcallmedom]

it is already configured so, as far as I can tell; can you say more about what permissions chairs seem not to have?

[alvestrand]

The particular oddity I noted was that I had a greyed-out "resolve conflicts" button on #20

[dontcallmedom]

I get the same - the tooltip on the button says "These conflicts are too complex to resolve in the web editor".