Fix build error

Missed this merge conflict.