Fix honest to god semantic merge conflict… they exist!