Update s/r conflict total after Ross added four more. The total
according to the comment is currently one more than the real number,
so one of them must have gone away. At some point we should track
down which one.
Attach a file by drag & drop or click to upload