fix merge conflicts I've overlooked in the first round