Fix remaining code from previous conflict