fix regression from incorrect conflict resolution in prev commit

thanks for catching this LemonBoy
2b698888ceAndrew Kelley committed on 9/13/2019, 6:42:30 PMparent187a6d1
1 file changedLine totals unavailable