Fix broken build

missed one line when fixing merge conflicts.