fix merge copy-paste-o
authored by Brian Olson and committed by Brian Olson 1 year ago d67ed727 63d2b488