Good point, I think git 'fixed' this in the merge.