Fix bad merge

good catch by @VictorLowther