So, if I understand correctly, the green one was the original line and is the correct one but in an earlier commit Dave accidentally put in the red line?  If so, then I should just go ahead and merge the commit, yes?  If not,  what value should the line be changed to?  Do I merge and then submit a new pull request with a new value?  Jonathan, is that the usual way of making a correction like this on GitHub?  Thanks!