Very very interesting... I had accepted upstream/master changes then re-applied my line. Very bizarre. Will fix now.