Students don't have a "Resolve Conflicts" button

[talraveh1]

Hi everyone,

After updating an assignment template and creating a pull request for the student repos, students can open the pull request and merge the changes if there are no conflicts.

However, if there are conflicts, they are stuck - there is no "Resolve Conflicts" button, unless I give them write permissions (or above) to the template repo (obviously giving them write permissions is a big no-no).

Following is a screenshot from a (test) student account: