Looking at the gitx commit logs I see that I deleted it, probably by accident, and that's how I got a passing test.  That's my clue as to where the merge conflict is probably coming from, right?